Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpio: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("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>

authored by

Uwe Kleine-König and committed by
Bartosz Golaszewski
678eefc1 3bd13ae0

+23 -23
+1 -1
drivers/gpio/gpio-altera.c
··· 336 336 .of_match_table = altera_gpio_of_match, 337 337 }, 338 338 .probe = altera_gpio_probe, 339 - .remove_new = altera_gpio_remove, 339 + .remove = altera_gpio_remove, 340 340 }; 341 341 342 342 static int __init altera_gpio_init(void)
+1 -1
drivers/gpio/gpio-brcmstb.c
··· 751 751 .pm = &brcmstb_gpio_pm_ops, 752 752 }, 753 753 .probe = brcmstb_gpio_probe, 754 - .remove_new = brcmstb_gpio_remove, 754 + .remove = brcmstb_gpio_remove, 755 755 .shutdown = brcmstb_gpio_shutdown, 756 756 }; 757 757 module_platform_driver(brcmstb_gpio_driver);
+1 -1
drivers/gpio/gpio-cadence.c
··· 277 277 .of_match_table = cdns_of_ids, 278 278 }, 279 279 .probe = cdns_gpio_probe, 280 - .remove_new = cdns_gpio_remove, 280 + .remove = cdns_gpio_remove, 281 281 }; 282 282 module_platform_driver(cdns_gpio_driver); 283 283
+1 -1
drivers/gpio/gpio-dln2.c
··· 512 512 static struct platform_driver dln2_gpio_driver = { 513 513 .driver.name = "dln2-gpio", 514 514 .probe = dln2_gpio_probe, 515 - .remove_new = dln2_gpio_remove, 515 + .remove = dln2_gpio_remove, 516 516 }; 517 517 518 518 module_platform_driver(dln2_gpio_driver);
+1 -1
drivers/gpio/gpio-ftgpio010.c
··· 350 350 .of_match_table = ftgpio_gpio_of_match, 351 351 }, 352 352 .probe = ftgpio_gpio_probe, 353 - .remove_new = ftgpio_gpio_remove, 353 + .remove = ftgpio_gpio_remove, 354 354 }; 355 355 builtin_platform_driver(ftgpio_gpio_driver);
+1 -1
drivers/gpio/gpio-grgpio.c
··· 455 455 .of_match_table = grgpio_match, 456 456 }, 457 457 .probe = grgpio_probe, 458 - .remove_new = grgpio_remove, 458 + .remove = grgpio_remove, 459 459 }; 460 460 module_platform_driver(grgpio_driver); 461 461
+1 -1
drivers/gpio/gpio-lpc18xx.c
··· 388 388 389 389 static struct platform_driver lpc18xx_gpio_driver = { 390 390 .probe = lpc18xx_gpio_probe, 391 - .remove_new = lpc18xx_gpio_remove, 391 + .remove = lpc18xx_gpio_remove, 392 392 .driver = { 393 393 .name = "lpc18xx-gpio", 394 394 .of_match_table = lpc18xx_gpio_match,
+1 -1
drivers/gpio/gpio-mb86s7x.c
··· 227 227 .acpi_match_table = ACPI_PTR(mb86s70_gpio_acpi_ids), 228 228 }, 229 229 .probe = mb86s70_gpio_probe, 230 - .remove_new = mb86s70_gpio_remove, 230 + .remove = mb86s70_gpio_remove, 231 231 }; 232 232 module_platform_driver(mb86s70_gpio_driver); 233 233
+1 -1
drivers/gpio/gpio-mm-lantiq.c
··· 136 136 137 137 static struct platform_driver ltq_mm_driver = { 138 138 .probe = ltq_mm_probe, 139 - .remove_new = ltq_mm_remove, 139 + .remove = ltq_mm_remove, 140 140 .driver = { 141 141 .name = "gpio-mm-ltq", 142 142 .of_match_table = ltq_mm_match,
+2 -2
drivers/gpio/gpio-mpc5200.c
··· 183 183 .of_match_table = mpc52xx_wkup_gpiochip_match, 184 184 }, 185 185 .probe = mpc52xx_wkup_gpiochip_probe, 186 - .remove_new = mpc52xx_gpiochip_remove, 186 + .remove = mpc52xx_gpiochip_remove, 187 187 }; 188 188 189 189 /* ··· 336 336 .of_match_table = mpc52xx_simple_gpiochip_match, 337 337 }, 338 338 .probe = mpc52xx_simple_gpiochip_probe, 339 - .remove_new = mpc52xx_gpiochip_remove, 339 + .remove = mpc52xx_gpiochip_remove, 340 340 }; 341 341 342 342 static struct platform_driver * const drivers[] = {
+1 -1
drivers/gpio/gpio-mpc8xxx.c
··· 460 460 461 461 static struct platform_driver mpc8xxx_plat_driver = { 462 462 .probe = mpc8xxx_probe, 463 - .remove_new = mpc8xxx_remove, 463 + .remove = mpc8xxx_remove, 464 464 .driver = { 465 465 .name = "gpio-mpc8xxx", 466 466 .of_match_table = mpc8xxx_gpio_ids,
+1 -1
drivers/gpio/gpio-omap.c
··· 1557 1557 1558 1558 static struct platform_driver omap_gpio_driver = { 1559 1559 .probe = omap_gpio_probe, 1560 - .remove_new = omap_gpio_remove, 1560 + .remove = omap_gpio_remove, 1561 1561 .driver = { 1562 1562 .name = "omap_gpio", 1563 1563 .pm = &gpio_pm_ops,
+1 -1
drivers/gpio/gpio-rcar.c
··· 657 657 658 658 static struct platform_driver gpio_rcar_device_driver = { 659 659 .probe = gpio_rcar_probe, 660 - .remove_new = gpio_rcar_remove, 660 + .remove = gpio_rcar_remove, 661 661 .driver = { 662 662 .name = "gpio_rcar", 663 663 .pm = &gpio_rcar_pm_ops,
+1 -1
drivers/gpio/gpio-rockchip.c
··· 795 795 796 796 static struct platform_driver rockchip_gpio_driver = { 797 797 .probe = rockchip_gpio_probe, 798 - .remove_new = rockchip_gpio_remove, 798 + .remove = rockchip_gpio_remove, 799 799 .driver = { 800 800 .name = "rockchip-gpio", 801 801 .of_match_table = rockchip_gpio_match,
+1 -1
drivers/gpio/gpio-sloppy-logic-analyzer.c
··· 311 311 312 312 static struct platform_driver gpio_la_poll_device_driver = { 313 313 .probe = gpio_la_poll_probe, 314 - .remove_new = gpio_la_poll_remove, 314 + .remove = gpio_la_poll_remove, 315 315 .driver = { 316 316 .name = GPIO_LA_NAME, 317 317 .of_match_table = gpio_la_poll_of_match,
+1 -1
drivers/gpio/gpio-tb10x.c
··· 235 235 236 236 static struct platform_driver tb10x_gpio_driver = { 237 237 .probe = tb10x_gpio_probe, 238 - .remove_new = tb10x_gpio_remove, 238 + .remove = tb10x_gpio_remove, 239 239 .driver = { 240 240 .name = "tb10x-gpio", 241 241 .of_match_table = tb10x_gpio_dt_ids,
+1 -1
drivers/gpio/gpio-ts5500.c
··· 433 433 .name = "ts5500-dio", 434 434 }, 435 435 .probe = ts5500_dio_probe, 436 - .remove_new = ts5500_dio_remove, 436 + .remove = ts5500_dio_remove, 437 437 .id_table = ts5500_dio_ids, 438 438 }; 439 439
+1 -1
drivers/gpio/gpio-uniphier.c
··· 481 481 482 482 static struct platform_driver uniphier_gpio_driver = { 483 483 .probe = uniphier_gpio_probe, 484 - .remove_new = uniphier_gpio_remove, 484 + .remove = uniphier_gpio_remove, 485 485 .driver = { 486 486 .name = "uniphier-gpio", 487 487 .of_match_table = uniphier_gpio_match,
+1 -1
drivers/gpio/gpio-xgene-sb.c
··· 325 325 .acpi_match_table = ACPI_PTR(xgene_gpio_sb_acpi_match), 326 326 }, 327 327 .probe = xgene_gpio_sb_probe, 328 - .remove_new = xgene_gpio_sb_remove, 328 + .remove = xgene_gpio_sb_remove, 329 329 }; 330 330 module_platform_driver(xgene_gpio_sb_driver); 331 331
+1 -1
drivers/gpio/gpio-xgs-iproc.c
··· 316 316 .of_match_table = bcm_iproc_gpio_of_match, 317 317 }, 318 318 .probe = iproc_gpio_probe, 319 - .remove_new = iproc_gpio_remove, 319 + .remove = iproc_gpio_remove, 320 320 }; 321 321 322 322 module_platform_driver(bcm_iproc_gpio_driver);
+1 -1
drivers/gpio/gpio-xilinx.c
··· 702 702 703 703 static struct platform_driver xgpio_plat_driver = { 704 704 .probe = xgpio_probe, 705 - .remove_new = xgpio_remove, 705 + .remove = xgpio_remove, 706 706 .driver = { 707 707 .name = "gpio-xilinx", 708 708 .of_match_table = xgpio_of_match,
+1 -1
drivers/gpio/gpio-zynq.c
··· 1023 1023 .of_match_table = zynq_gpio_of_match, 1024 1024 }, 1025 1025 .probe = zynq_gpio_probe, 1026 - .remove_new = zynq_gpio_remove, 1026 + .remove = zynq_gpio_remove, 1027 1027 }; 1028 1028 1029 1029 module_platform_driver(zynq_gpio_driver);