Commit 562b0b03 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wim Van Sebroeck
Browse files

watchdog: 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/watchdog/ 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.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241010203622.839625-4-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 43439076

drivers/watchdog/acquirewdt.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void acq_shutdown(struct platform_device *dev) 
}



static struct platform_driver acquirewdt_driver = {

	.remove_new	= acq_remove,

	.remove		= acq_remove,

	.shutdown	= acq_shutdown,

	.driver		= {

		.name	= DRV_NAME,

drivers/watchdog/advantechwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static void advwdt_shutdown(struct platform_device *dev) 
}



static struct platform_driver advwdt_driver = {

	.remove_new	= advwdt_remove,

	.remove		= advwdt_remove,

	.shutdown	= advwdt_shutdown,

	.driver		= {

		.name	= DRV_NAME,

drivers/watchdog/at91rm9200_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); 


static struct platform_driver at91wdt_driver = {

	.probe		= at91wdt_probe,

	.remove_new	= at91wdt_remove,

	.remove		= at91wdt_remove,

	.shutdown	= at91wdt_shutdown,

	.suspend	= pm_ptr(at91wdt_suspend),

	.resume		= pm_ptr(at91wdt_resume),

drivers/watchdog/at91sam9_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); 


static struct platform_driver at91wdt_driver = {

	.probe		= at91wdt_probe,

	.remove_new	= at91wdt_remove,

	.remove		= at91wdt_remove,

	.driver		= {

		.name	= "at91_wdt",

		.of_match_table = of_match_ptr(at91_wdt_dt_ids),

drivers/watchdog/ath79_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ MODULE_DEVICE_TABLE(of, ath79_wdt_match); 


static struct platform_driver ath79_wdt_driver = {

	.probe		= ath79_wdt_probe,

	.remove_new	= ath79_wdt_remove,

	.remove		= ath79_wdt_remove,

	.shutdown	= ath79_wdt_shutdown,

	.driver		= {

		.name	= DRIVER_NAME,