]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: aw9523: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Thu, 12 Jun 2025 13:15:15 +0000 (15:15 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 18 Jun 2025 12:08:37 +0000 (14:08 +0200)
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/20250612-gpiochip-set-rv-pinctrl-remaining-v1-6-556b0a530cd4@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-aw9523.c

index 9bf53de20be874661168ba28f64517b4325ce0c3..c844540384198f40f1142528d815fb6e4d5194b7 100644 (file)
@@ -625,14 +625,14 @@ out:
        return ret;
 }
 
-static void aw9523_gpio_set_multiple(struct gpio_chip *chip,
+static int aw9523_gpio_set_multiple(struct gpio_chip *chip,
                                    unsigned long *mask,
                                    unsigned long *bits)
 {
        struct aw9523 *awi = gpiochip_get_data(chip);
        u8 mask_lo, mask_hi, bits_lo, bits_hi;
        unsigned int reg;
-       int ret;
+       int ret = 0;
 
        mask_lo = *mask;
        mask_hi = *mask >> 8;
@@ -644,27 +644,33 @@ static void aw9523_gpio_set_multiple(struct gpio_chip *chip,
                reg = AW9523_REG_OUT_STATE(AW9523_PINS_PER_PORT);
                ret = regmap_write_bits(awi->regmap, reg, mask_hi, bits_hi);
                if (ret)
-                       dev_warn(awi->dev, "Cannot write port1 out level\n");
+                       goto out;
        }
        if (mask_lo) {
                reg = AW9523_REG_OUT_STATE(0);
                ret = regmap_write_bits(awi->regmap, reg, mask_lo, bits_lo);
                if (ret)
-                       dev_warn(awi->dev, "Cannot write port0 out level\n");
+                       goto out;
        }
        mutex_unlock(&awi->i2c_lock);
+
+out:
+       return ret;
 }
 
-static void aw9523_gpio_set(struct gpio_chip *chip,
-                           unsigned int offset, int value)
+static int aw9523_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                          int value)
 {
        struct aw9523 *awi = gpiochip_get_data(chip);
        u8 regbit = offset % AW9523_PINS_PER_PORT;
+       int ret;
 
        mutex_lock(&awi->i2c_lock);
-       regmap_update_bits(awi->regmap, AW9523_REG_OUT_STATE(offset),
-                          BIT(regbit), value ? BIT(regbit) : 0);
+       ret = regmap_update_bits(awi->regmap, AW9523_REG_OUT_STATE(offset),
+                                BIT(regbit), value ? BIT(regbit) : 0);
        mutex_unlock(&awi->i2c_lock);
+
+       return ret;
 }
 
 
@@ -779,8 +785,8 @@ static int aw9523_init_gpiochip(struct aw9523 *awi, unsigned int npins)
        gc->direction_output = aw9523_direction_output;
        gc->get = aw9523_gpio_get;
        gc->get_multiple = aw9523_gpio_get_multiple;
-       gc->set = aw9523_gpio_set;
-       gc->set_multiple = aw9523_gpio_set_multiple;
+       gc->set_rv = aw9523_gpio_set;
+       gc->set_multiple_rv = aw9523_gpio_set_multiple;
        gc->set_config = gpiochip_generic_config;
        gc->parent = dev;
        gc->owner = THIS_MODULE;