Commit 1a075b1d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Walleij
Browse files

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



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/pinctrl 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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/20241007205803.444994-8-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1fc30cd9

drivers/pinctrl/cirrus/pinctrl-madera-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ static void madera_pin_remove(struct platform_device *pdev) 


static struct platform_driver madera_pin_driver = {

	.probe = madera_pin_probe,

	.remove_new = madera_pin_remove,

	.remove = madera_pin_remove,

	.driver = {

		.name = "madera-pinctrl",

	},

drivers/pinctrl/intel/pinctrl-cherryview.c

+1 −1
Original line number Diff line number Diff line
@@ -1792,7 +1792,7 @@ MODULE_DEVICE_TABLE(acpi, chv_pinctrl_acpi_match); 


static struct platform_driver chv_pinctrl_driver = {

	.probe = chv_pinctrl_probe,

	.remove_new = chv_pinctrl_remove,

	.remove = chv_pinctrl_remove,

	.driver = {

		.name = "cherryview-pinctrl",

		.pm = pm_sleep_ptr(&chv_pinctrl_pm_ops),

drivers/pinctrl/nomadik/pinctrl-abx500.c

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static struct platform_driver abx500_gpio_driver = { 
		.of_match_table = abx500_gpio_match,

	},

	.probe = abx500_gpio_probe,

	.remove_new = abx500_gpio_remove,

	.remove = abx500_gpio_remove,

};



static int __init abx500_gpio_init(void)

drivers/pinctrl/pinctrl-amd.c

+1 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static struct platform_driver amd_gpio_driver = { 
#endif

	},

	.probe		= amd_gpio_probe,

	.remove_new	= amd_gpio_remove,

	.remove		= amd_gpio_remove,

};



module_platform_driver(amd_gpio_driver);

drivers/pinctrl/pinctrl-artpec6.c

+1 −1
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static struct platform_driver artpec6_pmx_driver = { 
		.of_match_table = artpec6_pinctrl_match,

	},

	.probe = artpec6_pmx_probe,

	.remove_new = artpec6_pmx_remove,

	.remove = artpec6_pmx_remove,

};



static int __init artpec6_pmx_init(void)