Commit e5eab1ae authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Belloni
Browse files

rtc: 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/rtc 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/20241007205803.444994-6-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d93f8ac2

drivers/rtc/rtc-88pm80x.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static struct platform_driver pm80x_rtc_driver = { 
		   .pm = &pm80x_rtc_pm_ops,

		   },

	.probe = pm80x_rtc_probe,

	.remove_new = pm80x_rtc_remove,

	.remove = pm80x_rtc_remove,

};



module_platform_driver(pm80x_rtc_driver);

drivers/rtc/rtc-88pm860x.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static struct platform_driver pm860x_rtc_driver = { 
		.pm	= &pm860x_rtc_pm_ops,

	},

	.probe		= pm860x_rtc_probe,

	.remove_new	= pm860x_rtc_remove,

	.remove		= pm860x_rtc_remove,

};



module_platform_driver(pm860x_rtc_driver);

drivers/rtc/rtc-ab8500.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static struct platform_driver ab8500_rtc_driver = { 
		.name = "ab8500-rtc",

	},

	.probe	= ab8500_rtc_probe,

	.remove_new = ab8500_rtc_remove,

	.remove = ab8500_rtc_remove,

	.id_table = ab85xx_rtc_ids,

};

drivers/rtc/rtc-ac100.c

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


static struct platform_driver ac100_rtc_driver = {

	.probe		= ac100_rtc_probe,

	.remove_new	= ac100_rtc_remove,

	.remove		= ac100_rtc_remove,

	.driver		= {

		.name		= "ac100-rtc",

		.of_match_table	= of_match_ptr(ac100_rtc_match),

drivers/rtc/rtc-asm9260.c

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


static struct platform_driver asm9260_rtc_driver = {

	.probe		= asm9260_rtc_probe,

	.remove_new	= asm9260_rtc_remove,

	.remove		= asm9260_rtc_remove,

	.driver		= {

		.name	= "asm9260-rtc",

		.of_match_table = asm9260_dt_ids,