Skip to content

Commit e5eab1a

Browse files
ukleinekalexandrebelloni
authored andcommitted
rtc: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent d93f8ac commit e5eab1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+47
-47
lines changed

drivers/rtc/rtc-88pm80x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ static struct platform_driver pm80x_rtc_driver = {
329329
.pm = &pm80x_rtc_pm_ops,
330330
},
331331
.probe = pm80x_rtc_probe,
332-
.remove_new = pm80x_rtc_remove,
332+
.remove = pm80x_rtc_remove,
333333
};
334334

335335
module_platform_driver(pm80x_rtc_driver);

drivers/rtc/rtc-88pm860x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static struct platform_driver pm860x_rtc_driver = {
371371
.pm = &pm860x_rtc_pm_ops,
372372
},
373373
.probe = pm860x_rtc_probe,
374-
.remove_new = pm860x_rtc_remove,
374+
.remove = pm860x_rtc_remove,
375375
};
376376

377377
module_platform_driver(pm860x_rtc_driver);

drivers/rtc/rtc-ab8500.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ static struct platform_driver ab8500_rtc_driver = {
403403
.name = "ab8500-rtc",
404404
},
405405
.probe = ab8500_rtc_probe,
406-
.remove_new = ab8500_rtc_remove,
406+
.remove = ab8500_rtc_remove,
407407
.id_table = ab85xx_rtc_ids,
408408
};
409409

drivers/rtc/rtc-ac100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ MODULE_DEVICE_TABLE(of, ac100_rtc_match);
628628

629629
static struct platform_driver ac100_rtc_driver = {
630630
.probe = ac100_rtc_probe,
631-
.remove_new = ac100_rtc_remove,
631+
.remove = ac100_rtc_remove,
632632
.driver = {
633633
.name = "ac100-rtc",
634634
.of_match_table = of_match_ptr(ac100_rtc_match),

drivers/rtc/rtc-asm9260.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ MODULE_DEVICE_TABLE(of, asm9260_dt_ids);
325325

326326
static struct platform_driver asm9260_rtc_driver = {
327327
.probe = asm9260_rtc_probe,
328-
.remove_new = asm9260_rtc_remove,
328+
.remove = asm9260_rtc_remove,
329329
.driver = {
330330
.name = "asm9260-rtc",
331331
.of_match_table = asm9260_dt_ids,

drivers/rtc/rtc-at91rm9200.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume);
640640
* triggering a section mismatch warning.
641641
*/
642642
static struct platform_driver at91_rtc_driver __refdata = {
643-
.remove_new = __exit_p(at91_rtc_remove),
643+
.remove = __exit_p(at91_rtc_remove),
644644
.shutdown = at91_rtc_shutdown,
645645
.driver = {
646646
.name = "at91_rtc",

drivers/rtc/rtc-at91sam9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ MODULE_DEVICE_TABLE(of, at91_rtc_dt_ids);
530530

531531
static struct platform_driver at91_rtc_driver = {
532532
.probe = at91_rtc_probe,
533-
.remove_new = at91_rtc_remove,
533+
.remove = at91_rtc_remove,
534534
.shutdown = at91_rtc_shutdown,
535535
.driver = {
536536
.name = "rtc-at91sam9",

drivers/rtc/rtc-brcmstb-waketimer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static const __maybe_unused struct of_device_id brcmstb_waketmr_of_match[] = {
417417

418418
static struct platform_driver brcmstb_waketmr_driver = {
419419
.probe = brcmstb_waketmr_probe,
420-
.remove_new = brcmstb_waketmr_remove,
420+
.remove = brcmstb_waketmr_remove,
421421
.driver = {
422422
.name = "brcmstb-waketimer",
423423
.pm = &brcmstb_waketmr_pm_ops,

drivers/rtc/rtc-cadence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static struct platform_driver cdns_rtc_driver = {
402402
.pm = &cdns_rtc_pm_ops,
403403
},
404404
.probe = cdns_rtc_probe,
405-
.remove_new = cdns_rtc_remove,
405+
.remove = cdns_rtc_remove,
406406
};
407407
module_platform_driver(cdns_rtc_driver);
408408

drivers/rtc/rtc-cmos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
15271527
MODULE_ALIAS("platform:rtc_cmos");
15281528

15291529
static struct platform_driver cmos_platform_driver = {
1530-
.remove_new = cmos_platform_remove,
1530+
.remove = cmos_platform_remove,
15311531
.shutdown = cmos_platform_shutdown,
15321532
.driver = {
15331533
.name = driver_name,

0 commit comments

Comments
 (0)