Commit 5d3aeecc authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Arnd Bergmann
Browse files

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: 9c378211 ("ARM: sa1100/gpio: use new line value setter callbacks")
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 990cd3e9

arch/arm/common/sa1111.c

+5 −3
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ 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,

static int sa1111_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,

				    unsigned long *bits)

{

	struct sa1111 *sachip = gc_to_sa1111(gc);
@@ -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;