Commit 678eefc1 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bartosz Golaszewski
Browse files

gpio: 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/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: default avatarUwe 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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 3bd13ae0

drivers/gpio/gpio-altera.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static struct platform_driver altera_gpio_driver = { 
		.of_match_table = altera_gpio_of_match,

	},

	.probe		= altera_gpio_probe,

	.remove_new	= altera_gpio_remove,

	.remove		= altera_gpio_remove,

};



static int __init altera_gpio_init(void)

drivers/gpio/gpio-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static struct platform_driver brcmstb_gpio_driver = { 
		.pm = &brcmstb_gpio_pm_ops,

	},

	.probe = brcmstb_gpio_probe,

	.remove_new = brcmstb_gpio_remove,

	.remove = brcmstb_gpio_remove,

	.shutdown = brcmstb_gpio_shutdown,

};

module_platform_driver(brcmstb_gpio_driver);

drivers/gpio/gpio-cadence.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct platform_driver cdns_gpio_driver = { 
		.of_match_table = cdns_of_ids,

	},

	.probe = cdns_gpio_probe,

	.remove_new = cdns_gpio_remove,

	.remove = cdns_gpio_remove,

};

module_platform_driver(cdns_gpio_driver);

drivers/gpio/gpio-dln2.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void dln2_gpio_remove(struct platform_device *pdev) 
static struct platform_driver dln2_gpio_driver = {

	.driver.name	= "dln2-gpio",

	.probe		= dln2_gpio_probe,

	.remove_new	= dln2_gpio_remove,

	.remove		= dln2_gpio_remove,

};



module_platform_driver(dln2_gpio_driver);

drivers/gpio/gpio-ftgpio010.c

+1 −1
Original line number Diff line number Diff line
@@ -350,6 +350,6 @@ static struct platform_driver ftgpio_gpio_driver = { 
		.of_match_table = ftgpio_gpio_of_match,

	},

	.probe = ftgpio_gpio_probe,

	.remove_new = ftgpio_gpio_remove,

	.remove = ftgpio_gpio_remove,

};

builtin_platform_driver(ftgpio_gpio_driver);