Commit d9d87d90 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

treewide: rename GPIO set callbacks back to their original names 



The conversion of all GPIO drivers to using the .set_rv() and
.set_multiple_rv() callbacks from struct gpio_chip (which - unlike their
predecessors - return an integer and allow the controller drivers to
indicate failures to users) is now complete and the legacy ones have
been removed. Rename the new callbacks back to their original names in
one sweeping change.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 397a46c9

arch/arm/common/sa1111.c

+2 −2
Original line number Diff line number Diff line
@@ -617,8 +617,8 @@ static int sa1111_setup_gpios(struct sa1111 *sachip) 
	sachip->gc.direction_input = sa1111_gpio_direction_input;

	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_rv = sa1111_gpio_set_multiple;

	sachip->gc.set = sa1111_gpio_set;

	sachip->gc.set_multiple = sa1111_gpio_set_multiple;

	sachip->gc.to_irq = sa1111_gpio_to_irq;

	sachip->gc.base = -1;

	sachip->gc.ngpio = 18;

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int scoop_probe(struct platform_device *pdev) 
		devptr->gpio.label = dev_name(&pdev->dev);

		devptr->gpio.base = inf->gpio_base;

		devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */

		devptr->gpio.set_rv = scoop_gpio_set;

		devptr->gpio.set = scoop_gpio_set;

		devptr->gpio.get = scoop_gpio_get;

		devptr->gpio.direction_input = scoop_gpio_direction_input;

		devptr->gpio.direction_output = scoop_gpio_direction_output;

arch/arm/mach-s3c/gpio-samsung.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip) 
	if (!gc->direction_output)

		gc->direction_output = samsung_gpiolib_2bit_output;

	if (!gc->set)

		gc->set_rv = samsung_gpiolib_set;

		gc->set = samsung_gpiolib_set;

	if (!gc->get)

		gc->get = samsung_gpiolib_get;

arch/arm/mach-sa1100/assabet.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val) 
{

	unsigned long m = mask, v = val;



	assabet_bcr_gc->set_multiple_rv(assabet_bcr_gc, &m, &v);

	assabet_bcr_gc->set_multiple(assabet_bcr_gc, &m, &v);

}

EXPORT_SYMBOL(ASSABET_BCR_frob);

arch/arm/mach-sa1100/neponset.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void neponset_ncr_frob(unsigned int mask, unsigned int val) 
	unsigned long m = mask, v = val;



	if (nep)

		n->gpio[0]->set_multiple_rv(n->gpio[0], &m, &v);

		n->gpio[0]->set_multiple(n->gpio[0], &m, &v);

	else

		WARN(1, "nep unset\n");

}