]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: starfive: jh7110: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Thu, 12 Jun 2025 12:24:31 +0000 (14:24 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 18 Jun 2025 12:06:23 +0000 (14:06 +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>
Reviewed-by: Hal Feng <hal.feng@starfivetech.com>
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Link: https://lore.kernel.org/20250612-gpiochip-set-rv-pinctrl-starfive-v1-2-8507b46516f5@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c

index 1d0d6c224c104e7e970d5e31e52b2fe3b19e2cad..082bb1c6cea9b29257b197f065c1a9deebc997fd 100644 (file)
@@ -608,8 +608,7 @@ static int jh7110_gpio_get(struct gpio_chip *gc, unsigned int gpio)
        return !!(readl_relaxed(reg) & BIT(gpio % 32));
 }
 
-static void jh7110_gpio_set(struct gpio_chip *gc,
-                           unsigned int gpio, int value)
+static int jh7110_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
 {
        struct jh7110_pinctrl *sfp = container_of(gc,
                        struct jh7110_pinctrl, gc);
@@ -625,6 +624,8 @@ static void jh7110_gpio_set(struct gpio_chip *gc,
        dout |= readl_relaxed(reg_dout) & ~mask;
        writel_relaxed(dout, reg_dout);
        raw_spin_unlock_irqrestore(&sfp->lock, flags);
+
+       return 0;
 }
 
 static int jh7110_gpio_set_config(struct gpio_chip *gc,
@@ -934,7 +935,7 @@ int jh7110_pinctrl_probe(struct platform_device *pdev)
        sfp->gc.direction_input = jh7110_gpio_direction_input;
        sfp->gc.direction_output = jh7110_gpio_direction_output;
        sfp->gc.get = jh7110_gpio_get;
-       sfp->gc.set = jh7110_gpio_set;
+       sfp->gc.set_rv = jh7110_gpio_set;
        sfp->gc.set_config = jh7110_gpio_set_config;
        sfp->gc.add_pin_ranges = jh7110_gpio_add_pin_ranges;
        sfp->gc.base = info->gc_base;