ARM: sa110/gpio: convert set_multiple() to returning an integer

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 <bartosz.golaszewski@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 86b271cc29e10ecf3426710df0e22884fdbaf7b7..d7e2ea27ce596175af9d474dde347c7d2b6b0b82 100644 (file)
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -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;