ARM: sa110/gpio: convert set_multiple() to returning an integer
Subsystems (2)
PATCH 1/1 ARM: sa110/gpio: convert set_multiple() to returning an integer
From: Bartosz Golaszewski <[email protected]>
The conversion to using the new GPIO line setter callbacks missed the set_multiple() in this file. Convert it to using the new callback.
Fixes 9c3782118a57 ("ARM: sa1100/gpio: use new line value setter callbacks")
Signed-off-by Bartosz Golaszewski <[email protected]>
--- arch/arm/common/sa1111.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/common/sa1111.c +5 -3
@@ -578,8 +578,8 @@ static int sa1111_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)return 0 ; } -static void sa1111_gpio_set_multiple (struct gpio_chip *gc,unsigned long *mask, -unsigned long *bits) +static int sa1111_gpio_set_multiple (struct gpio_chip *gc,unsigned long *mask, +unsigned long *bits) {struct sa1111 *sachip =gc_to_sa1111 (gc);unsigned long flags;
@@ -597,6 +597,8 @@ static void sa1111_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,sa1111_gpio_modify (reg +SA1111_GPIO_PCDWR , (msk >>12 ) &255 , val >>12 );sa1111_gpio_modify (reg +SA1111_GPIO_PCSSR , (msk >>12 ) &255 , val >>12 );spin_unlock_irqrestore (&sachip->lock, flags); + +return 0 ; }static int sa1111_gpio_to_irq (struct gpio_chip *gc,unsigned offset)
@@ -616,7 +618,7 @@ static int sa1111_setup_gpios(struct sa1111 *sachip) sachip->gc.direction_output = sa1111_gpio_direction_output; sachip->gc.get = sa1111_gpio_get; sachip->gc.set_rv = sa1111_gpio_set; - sachip->gc.set_multiple = sa1111_gpio_set_multiple; + sachip->gc.set_multiple_rv = sa1111_gpio_set_multiple; sachip->gc.to_irq = sa1111_gpio_to_irq; sachip->gc.base =-1 ; sachip->gc.ngpio =18 ;
Signature · 1 line
2.48.1
Quoted 7 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The conversion to using the new GPIO line setter callbacks missed the
set_multiple()in this file. Convert it to using the new callback.Fixes 9c3782118a57 ("ARM: sa1100/gpio: use new line value setter callbacks")Signed-off-by Bartosz Golaszewski <[email protected]>
Reviewed-by Linus Walleij <[email protected]>
Yours,
Linus Walleij