git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From 091655b9285d837db520381924c689bd5dc5d286 Mon Sep 17 00:00:00 2001
   2 From: Andy Shevchenko <andy.shevchenko@gmail.com>
   3 Date: Fri, 29 Mar 2024 12:55:17 +0200
   4 Subject: [PATCH] pinctrl: aw9523: Always try both ports in
   5  aw9523_gpio_set_multiple()
   6
   7 The ports are equivalent from the user's point of view. Don't limit
   8 trying them both if writing to one fails.
   9
  10 Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
  11 Message-ID: <20240329105634.712457-4-andy.shevchenko@gmail.com>
  12 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  13 ---
  14  drivers/pinctrl/pinctrl-aw9523.c | 7 ++-----
  15  1 file changed, 2 insertions(+), 5 deletions(-)
  16
  17 --- a/drivers/pinctrl/pinctrl-aw9523.c
  18 +++ b/drivers/pinctrl/pinctrl-aw9523.c
  19 @@ -653,7 +653,7 @@ static void aw9523_gpio_set_multiple(str
  20         struct aw9523 *awi = gpiochip_get_data(chip);
  21         u8 mask_lo, mask_hi, bits_lo, bits_hi;
  22         unsigned int reg;
  23 -       int ret = 0;
  24 +       int ret;
  25
  26         mask_lo = *mask & U8_MAX;
  27         mask_hi = (*mask >> 8) & U8_MAX;
  28 @@ -663,10 +663,8 @@ static void aw9523_gpio_set_multiple(str
  29                 bits_hi = (*bits >> 8) & U8_MAX;
  30
  31                 ret = regmap_write_bits(awi->regmap, reg, mask_hi, bits_hi);
  32 -               if (ret) {
  33 +               if (ret)
  34                         dev_warn(awi->dev, "Cannot write port1 out level\n");
  35 -                       goto out;
  36 -               }
  37         }
  38         if (mask_lo) {
  39                 reg = AW9523_REG_OUT_STATE(0);
  40 @@ -675,7 +673,6 @@ static void aw9523_gpio_set_multiple(str
  41                 if (ret)
  42                         dev_warn(awi->dev, "Cannot write port0 out level\n");
  43         }
  44 -out:
  45         mutex_unlock(&awi->i2c_lock);
  46  }
  47