Skip to content

Commit 678eefc

Browse files
ukleinekBartosz Golaszewski
authored andcommitted
gpio: Switch back to struct platform_driver::remove()
After commit 0edb555 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all platform drivers below drivers/gpio/ to use .remove(), with the eventual goal to drop struct platform_driver::remove_new(). As .remove() and .remove_new() have the same prototypes, conversion is done by just changing the structure member name in the driver initializer. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Link: https://lore.kernel.org/r/20241016152435.38149-2-u.kleine-koenig@baylibre.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
1 parent 3bd13ae commit 678eefc

22 files changed

+23
-23
lines changed

drivers/gpio/gpio-altera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static struct platform_driver altera_gpio_driver = {
336336
.of_match_table = altera_gpio_of_match,
337337
},
338338
.probe = altera_gpio_probe,
339-
.remove_new = altera_gpio_remove,
339+
.remove = altera_gpio_remove,
340340
};
341341

342342
static int __init altera_gpio_init(void)

drivers/gpio/gpio-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ static struct platform_driver brcmstb_gpio_driver = {
751751
.pm = &brcmstb_gpio_pm_ops,
752752
},
753753
.probe = brcmstb_gpio_probe,
754-
.remove_new = brcmstb_gpio_remove,
754+
.remove = brcmstb_gpio_remove,
755755
.shutdown = brcmstb_gpio_shutdown,
756756
};
757757
module_platform_driver(brcmstb_gpio_driver);

drivers/gpio/gpio-cadence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static struct platform_driver cdns_gpio_driver = {
277277
.of_match_table = cdns_of_ids,
278278
},
279279
.probe = cdns_gpio_probe,
280-
.remove_new = cdns_gpio_remove,
280+
.remove = cdns_gpio_remove,
281281
};
282282
module_platform_driver(cdns_gpio_driver);
283283

drivers/gpio/gpio-dln2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ static void dln2_gpio_remove(struct platform_device *pdev)
512512
static struct platform_driver dln2_gpio_driver = {
513513
.driver.name = "dln2-gpio",
514514
.probe = dln2_gpio_probe,
515-
.remove_new = dln2_gpio_remove,
515+
.remove = dln2_gpio_remove,
516516
};
517517

518518
module_platform_driver(dln2_gpio_driver);

drivers/gpio/gpio-ftgpio010.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,6 @@ static struct platform_driver ftgpio_gpio_driver = {
350350
.of_match_table = ftgpio_gpio_of_match,
351351
},
352352
.probe = ftgpio_gpio_probe,
353-
.remove_new = ftgpio_gpio_remove,
353+
.remove = ftgpio_gpio_remove,
354354
};
355355
builtin_platform_driver(ftgpio_gpio_driver);

drivers/gpio/gpio-grgpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static struct platform_driver grgpio_driver = {
455455
.of_match_table = grgpio_match,
456456
},
457457
.probe = grgpio_probe,
458-
.remove_new = grgpio_remove,
458+
.remove = grgpio_remove,
459459
};
460460
module_platform_driver(grgpio_driver);
461461

drivers/gpio/gpio-lpc18xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ MODULE_DEVICE_TABLE(of, lpc18xx_gpio_match);
388388

389389
static struct platform_driver lpc18xx_gpio_driver = {
390390
.probe = lpc18xx_gpio_probe,
391-
.remove_new = lpc18xx_gpio_remove,
391+
.remove = lpc18xx_gpio_remove,
392392
.driver = {
393393
.name = "lpc18xx-gpio",
394394
.of_match_table = lpc18xx_gpio_match,

drivers/gpio/gpio-mb86s7x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static struct platform_driver mb86s70_gpio_driver = {
227227
.acpi_match_table = ACPI_PTR(mb86s70_gpio_acpi_ids),
228228
},
229229
.probe = mb86s70_gpio_probe,
230-
.remove_new = mb86s70_gpio_remove,
230+
.remove = mb86s70_gpio_remove,
231231
};
232232
module_platform_driver(mb86s70_gpio_driver);
233233

drivers/gpio/gpio-mm-lantiq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ MODULE_DEVICE_TABLE(of, ltq_mm_match);
136136

137137
static struct platform_driver ltq_mm_driver = {
138138
.probe = ltq_mm_probe,
139-
.remove_new = ltq_mm_remove,
139+
.remove = ltq_mm_remove,
140140
.driver = {
141141
.name = "gpio-mm-ltq",
142142
.of_match_table = ltq_mm_match,

drivers/gpio/gpio-mpc5200.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
183183
.of_match_table = mpc52xx_wkup_gpiochip_match,
184184
},
185185
.probe = mpc52xx_wkup_gpiochip_probe,
186-
.remove_new = mpc52xx_gpiochip_remove,
186+
.remove = mpc52xx_gpiochip_remove,
187187
};
188188

189189
/*
@@ -336,7 +336,7 @@ static struct platform_driver mpc52xx_simple_gpiochip_driver = {
336336
.of_match_table = mpc52xx_simple_gpiochip_match,
337337
},
338338
.probe = mpc52xx_simple_gpiochip_probe,
339-
.remove_new = mpc52xx_gpiochip_remove,
339+
.remove = mpc52xx_gpiochip_remove,
340340
};
341341

342342
static struct platform_driver * const drivers[] = {

0 commit comments

Comments
 (0)