Commit 0227b49b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-updates-for-v6.17-rc1-part2' of... 

Merge tag 'gpio-updates-for-v6.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

Pull gpio updates from Bartosz Golaszewski:
 "As discussed: there's a small commit that removes the legacy GPIO line
  value setter callbacks as they're no longer used and a big, treewide
  commit that renames the new ones to the old names across all GPIO
  drivers at once.

  While at it: there are also two fixes that I picked up over the course
  of the merge window:

   - remove unused, legacy GPIO line value setters from struct gpio_chip

   - rename the new set callbacks back to the original names treewide

   - fix interrupt handling in gpio-mlxbf2

   - revert a buggy immutable irqchip conversion"

* tag 'gpio-updates-for-v6.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  treewide: rename GPIO set callbacks back to their original names
  gpio: remove legacy GPIO line value setter callbacks
  gpio: mlxbf2: use platform_get_irq_optional()
  Revert "gpio: pxa: Make irq_chip immutable"
parents c93913c7 d9d87d90

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

+2 −2
Original line number Diff line number Diff line
@@ -516,8 +516,8 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip) 
		gc->direction_input = samsung_gpiolib_2bit_input;

	if (!gc->direction_output)

		gc->direction_output = samsung_gpiolib_2bit_output;

	if (!gc->set_rv)

		gc->set_rv = samsung_gpiolib_set;

	if (!gc->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");

}