Skip to content

Commit 0227b49

Browse files
committed
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"
2 parents c93913c + d9d87d9 commit 0227b49

File tree

283 files changed

+359
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+359
-388
lines changed

arch/arm/common/sa1111.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ static int sa1111_setup_gpios(struct sa1111 *sachip)
617617
sachip->gc.direction_input = sa1111_gpio_direction_input;
618618
sachip->gc.direction_output = sa1111_gpio_direction_output;
619619
sachip->gc.get = sa1111_gpio_get;
620-
sachip->gc.set_rv = sa1111_gpio_set;
621-
sachip->gc.set_multiple_rv = sa1111_gpio_set_multiple;
620+
sachip->gc.set = sa1111_gpio_set;
621+
sachip->gc.set_multiple = sa1111_gpio_set_multiple;
622622
sachip->gc.to_irq = sa1111_gpio_to_irq;
623623
sachip->gc.base = -1;
624624
sachip->gc.ngpio = 18;

arch/arm/common/scoop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int scoop_probe(struct platform_device *pdev)
218218
devptr->gpio.label = dev_name(&pdev->dev);
219219
devptr->gpio.base = inf->gpio_base;
220220
devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */
221-
devptr->gpio.set_rv = scoop_gpio_set;
221+
devptr->gpio.set = scoop_gpio_set;
222222
devptr->gpio.get = scoop_gpio_get;
223223
devptr->gpio.direction_input = scoop_gpio_direction_input;
224224
devptr->gpio.direction_output = scoop_gpio_direction_output;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
516516
gc->direction_input = samsung_gpiolib_2bit_input;
517517
if (!gc->direction_output)
518518
gc->direction_output = samsung_gpiolib_2bit_output;
519-
if (!gc->set_rv)
520-
gc->set_rv = samsung_gpiolib_set;
519+
if (!gc->set)
520+
gc->set = samsung_gpiolib_set;
521521
if (!gc->get)
522522
gc->get = samsung_gpiolib_get;
523523

arch/arm/mach-sa1100/assabet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val)
8080
{
8181
unsigned long m = mask, v = val;
8282

83-
assabet_bcr_gc->set_multiple_rv(assabet_bcr_gc, &m, &v);
83+
assabet_bcr_gc->set_multiple(assabet_bcr_gc, &m, &v);
8484
}
8585
EXPORT_SYMBOL(ASSABET_BCR_frob);
8686

arch/arm/mach-sa1100/neponset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void neponset_ncr_frob(unsigned int mask, unsigned int val)
126126
unsigned long m = mask, v = val;
127127

128128
if (nep)
129-
n->gpio[0]->set_multiple_rv(n->gpio[0], &m, &v);
129+
n->gpio[0]->set_multiple(n->gpio[0], &m, &v);
130130
else
131131
WARN(1, "nep unset\n");
132132
}

arch/arm/plat-orion/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
540540
ochip->chip.direction_input = orion_gpio_direction_input;
541541
ochip->chip.get = orion_gpio_get;
542542
ochip->chip.direction_output = orion_gpio_direction_output;
543-
ochip->chip.set_rv = orion_gpio_set;
543+
ochip->chip.set = orion_gpio_set;
544544
ochip->chip.to_irq = orion_gpio_to_irq;
545545
ochip->chip.base = gpio_base;
546546
ochip->chip.ngpio = ngpio;

arch/m68k/coldfire/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static struct gpio_chip mcfgpio_chip = {
160160
.direction_input = mcfgpio_direction_input,
161161
.direction_output = mcfgpio_direction_output,
162162
.get = mcfgpio_get_value,
163-
.set_rv = mcfgpio_set_value,
163+
.set = mcfgpio_set_value,
164164
.to_irq = mcfgpio_to_irq,
165165
.base = 0,
166166
.ngpio = MCFGPIO_PIN_MAX,

arch/mips/alchemy/common/gpiolib.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct gpio_chip alchemy_gpio_chip[] = {
101101
.direction_input = gpio1_direction_input,
102102
.direction_output = gpio1_direction_output,
103103
.get = gpio1_get,
104-
.set_rv = gpio1_set,
104+
.set = gpio1_set,
105105
.to_irq = gpio1_to_irq,
106106
.base = ALCHEMY_GPIO1_BASE,
107107
.ngpio = ALCHEMY_GPIO1_NUM,
@@ -111,7 +111,7 @@ struct gpio_chip alchemy_gpio_chip[] = {
111111
.direction_input = gpio2_direction_input,
112112
.direction_output = gpio2_direction_output,
113113
.get = gpio2_get,
114-
.set_rv = gpio2_set,
114+
.set = gpio2_set,
115115
.to_irq = gpio2_to_irq,
116116
.base = ALCHEMY_GPIO2_BASE,
117117
.ngpio = ALCHEMY_GPIO2_NUM,
@@ -151,7 +151,7 @@ static struct gpio_chip au1300_gpiochip = {
151151
.direction_input = alchemy_gpic_dir_input,
152152
.direction_output = alchemy_gpic_dir_output,
153153
.get = alchemy_gpic_get,
154-
.set_rv = alchemy_gpic_set,
154+
.set = alchemy_gpic_set,
155155
.to_irq = alchemy_gpic_gpio_to_irq,
156156
.base = AU1300_GPIO_BASE,
157157
.ngpio = AU1300_GPIO_NUM,

arch/mips/bcm63xx/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static struct gpio_chip bcm63xx_gpio_chip = {
131131
.direction_input = bcm63xx_gpio_direction_input,
132132
.direction_output = bcm63xx_gpio_direction_output,
133133
.get = bcm63xx_gpio_get,
134-
.set_rv = bcm63xx_gpio_set,
134+
.set = bcm63xx_gpio_set,
135135
.base = 0,
136136
};
137137

arch/mips/kernel/gpio_txx9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static int txx9_gpio_dir_out(struct gpio_chip *chip, unsigned int offset,
7070

7171
static struct gpio_chip txx9_gpio_chip = {
7272
.get = txx9_gpio_get,
73-
.set_rv = txx9_gpio_set,
73+
.set = txx9_gpio_set,
7474
.direction_input = txx9_gpio_dir_in,
7575
.direction_output = txx9_gpio_dir_out,
7676
.label = "TXx9",

0 commit comments

Comments
 (0)