summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2022-10-18 18:12:23 +0300
committerLinus Walleij <linus.walleij@linaro.org>2022-10-21 11:29:23 +0300
commit417c326091b06eadb93511e638e8c36230dae2e6 (patch)
tree4684075ca58ab6a89255e8f150da3bf1998d0ff6
parent1d66e379731f79ae5039a869c0fde22a4f6a6a91 (diff)
downloadlinux-417c326091b06eadb93511e638e8c36230dae2e6.tar.xz
pinctrl: cy8c95x0: Don't use cy8c95x0_set_mode() twice
Instead, call it once in cy8c95x0_pinmux_mode() and if selector is 0, shortcut the flow by returning 0 immediately. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20221018151223.80846-1-andriy.shevchenko@linux.intel.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-cy8c95x0.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index b44b36be54b3..ee753e080481 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -1107,13 +1107,13 @@ static int cy8c95x0_pinmux_mode(struct cy8c95x0_pinctrl *chip,
u8 bit = cypress_get_pin_mask(chip, group);
int ret;
- if (selector == 0)
- return cy8c95x0_set_mode(chip, group, false);
-
- ret = cy8c95x0_set_mode(chip, group, true);
+ ret = cy8c95x0_set_mode(chip, group, selector);
if (ret < 0)
return ret;
+ if (selector == 0)
+ return 0;
+
/* Set direction to output & set output to 1 so that PWM can work */
ret = regmap_write_bits(chip->regmap, CY8C95X0_DIRECTION, bit, bit);
if (ret < 0)