]> www.infradead.org Git - linux.git/commitdiff
gpio: madera: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 6 May 2025 09:01:48 +0000 (11:01 +0200)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 13 May 2025 13:15:34 +0000 (15:15 +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.

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20250506-gpiochip-set-rv-gpio-part3-v1-5-0fbdea5a9667@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-madera.c

index 8f38303fcbc4a5621e93f5f22b189ac1dc4a241c..e73e72d62bc8d535facbc6164635c8c6329d4f82 100644 (file)
@@ -87,23 +87,17 @@ static int madera_gpio_direction_out(struct gpio_chip *chip,
                                  MADERA_GP1_LVL_MASK, reg_val);
 }
 
-static void madera_gpio_set(struct gpio_chip *chip, unsigned int offset,
-                           int value)
+static int madera_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                          int value)
 {
        struct madera_gpio *madera_gpio = gpiochip_get_data(chip);
        struct madera *madera = madera_gpio->madera;
        unsigned int reg_offset = 2 * offset;
        unsigned int reg_val = value ? MADERA_GP1_LVL : 0;
-       int ret;
-
-       ret = regmap_update_bits(madera->regmap,
-                                MADERA_GPIO1_CTRL_1 + reg_offset,
-                                MADERA_GP1_LVL_MASK, reg_val);
 
-       /* set() doesn't return an error so log a warning */
-       if (ret)
-               dev_warn(madera->dev, "Failed to write to 0x%x (%d)\n",
-                        MADERA_GPIO1_CTRL_1 + reg_offset, ret);
+       return regmap_update_bits(madera->regmap,
+                                 MADERA_GPIO1_CTRL_1 + reg_offset,
+                                 MADERA_GP1_LVL_MASK, reg_val);
 }
 
 static const struct gpio_chip madera_gpio_chip = {
@@ -115,7 +109,7 @@ static const struct gpio_chip madera_gpio_chip = {
        .direction_input        = madera_gpio_direction_in,
        .get                    = madera_gpio_get,
        .direction_output       = madera_gpio_direction_out,
-       .set                    = madera_gpio_set,
+       .set_rv                 = madera_gpio_set,
        .set_config             = gpiochip_generic_config,
        .can_sleep              = true,
 };