Message ID | 20250408-gpiochip-set-rv-powerpc-v1-3-73dc1ebc6ef1@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | powerpc: convert board-file GPIO chips to using new value setters | expand |
Le 08/04/2025 à 09:21, Bartosz Golaszewski a écrit : > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > 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: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/platforms/44x/gpio.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/platforms/44x/gpio.c b/arch/powerpc/platforms/44x/gpio.c > index e5f2319e5cbe..d540e261d85a 100644 > --- a/arch/powerpc/platforms/44x/gpio.c > +++ b/arch/powerpc/platforms/44x/gpio.c > @@ -75,8 +75,7 @@ __ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) > clrbits32(®s->or, GPIO_MASK(gpio)); > } > > -static void > -ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) > +static int ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) > { > struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc); > unsigned long flags; > @@ -88,6 +87,8 @@ ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) > spin_unlock_irqrestore(&chip->lock, flags); > > pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val); > + > + return 0; > } > > static int ppc4xx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) > @@ -179,7 +180,7 @@ static int __init ppc4xx_add_gpiochips(void) > gc->direction_input = ppc4xx_gpio_dir_in; > gc->direction_output = ppc4xx_gpio_dir_out; > gc->get = ppc4xx_gpio_get; > - gc->set = ppc4xx_gpio_set; > + gc->set_rv = ppc4xx_gpio_set; > > ret = of_mm_gpiochip_add_data(np, mm_gc, ppc4xx_gc); > if (ret) >
diff --git a/arch/powerpc/platforms/44x/gpio.c b/arch/powerpc/platforms/44x/gpio.c index e5f2319e5cbe..d540e261d85a 100644 --- a/arch/powerpc/platforms/44x/gpio.c +++ b/arch/powerpc/platforms/44x/gpio.c @@ -75,8 +75,7 @@ __ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) clrbits32(®s->or, GPIO_MASK(gpio)); } -static void -ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) +static int ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) { struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc); unsigned long flags; @@ -88,6 +87,8 @@ ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) spin_unlock_irqrestore(&chip->lock, flags); pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val); + + return 0; } static int ppc4xx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) @@ -179,7 +180,7 @@ static int __init ppc4xx_add_gpiochips(void) gc->direction_input = ppc4xx_gpio_dir_in; gc->direction_output = ppc4xx_gpio_dir_out; gc->get = ppc4xx_gpio_get; - gc->set = ppc4xx_gpio_set; + gc->set_rv = ppc4xx_gpio_set; ret = of_mm_gpiochip_add_data(np, mm_gc, ppc4xx_gc); if (ret)