]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpio: wm831x: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 9 Jul 2025 06:41:43 +0000 (08:41 +0200)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 15 Jul 2025 07:54:41 +0000 (09:54 +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/20250709-gpiochip-set-rv-gpio-remaining-v1-6-b8950f69618d@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-wm831x.c

index 61bb83a1e8ae4de29c57066944ce25beacdb454c..ab58aa7c0b9965ff13ea82efa22dbf6fa5d06c92 100644 (file)
@@ -58,13 +58,14 @@ static int wm831x_gpio_get(struct gpio_chip *chip, unsigned offset)
                return 0;
 }
 
-static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+static int wm831x_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                          int value)
 {
        struct wm831x_gpio *wm831x_gpio = gpiochip_get_data(chip);
        struct wm831x *wm831x = wm831x_gpio->wm831x;
 
-       wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,
-                       value << offset);
+       return wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,
+                              value << offset);
 }
 
 static int wm831x_gpio_direction_out(struct gpio_chip *chip,
@@ -85,9 +86,7 @@ static int wm831x_gpio_direction_out(struct gpio_chip *chip,
                return ret;
 
        /* Can only set GPIO state once it's in output mode */
-       wm831x_gpio_set(chip, offset, value);
-
-       return 0;
+       return wm831x_gpio_set(chip, offset, value);
 }
 
 static int wm831x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
@@ -254,7 +253,7 @@ static const struct gpio_chip template_chip = {
        .direction_input        = wm831x_gpio_direction_in,
        .get                    = wm831x_gpio_get,
        .direction_output       = wm831x_gpio_direction_out,
-       .set                    = wm831x_gpio_set,
+       .set_rv                 = wm831x_gpio_set,
        .to_irq                 = wm831x_gpio_to_irq,
        .set_config             = wm831x_set_config,
        .dbg_show               = wm831x_gpio_dbg_show,