| Message ID | 20221018151223.80846-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 417c326091b06eadb93511e638e8c36230dae2e6 |
| Headers | show |
| Series | [v1,1/1] pinctrl: cy8c95x0: Don't use cy8c95x0_set_mode() twice | expand |
On Tue, Oct 18, 2022 at 5:16 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > 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> Patch applied! Yours, Linus Walleij
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)
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> --- drivers/pinctrl/pinctrl-cy8c95x0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)