mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
rtc: Switch back to struct platform_driver::remove()
After commit 0edb555a65 ("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 <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241007205803.444994-6-u.kleine-koenig@baylibre.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
committed by
Alexandre Belloni
parent
d93f8ac23b
commit
e5eab1aeae
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -640,7 +640,7 @@ static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume);
|
||||
* triggering a section mismatch warning.
|
||||
*/
|
||||
static struct platform_driver at91_rtc_driver __refdata = {
|
||||
.remove_new = __exit_p(at91_rtc_remove),
|
||||
.remove = __exit_p(at91_rtc_remove),
|
||||
.shutdown = at91_rtc_shutdown,
|
||||
.driver = {
|
||||
.name = "at91_rtc",
|
||||
|
||||
@@ -530,7 +530,7 @@ MODULE_DEVICE_TABLE(of, at91_rtc_dt_ids);
|
||||
|
||||
static struct platform_driver at91_rtc_driver = {
|
||||
.probe = at91_rtc_probe,
|
||||
.remove_new = at91_rtc_remove,
|
||||
.remove = at91_rtc_remove,
|
||||
.shutdown = at91_rtc_shutdown,
|
||||
.driver = {
|
||||
.name = "rtc-at91sam9",
|
||||
|
||||
@@ -417,7 +417,7 @@ static const __maybe_unused struct of_device_id brcmstb_waketmr_of_match[] = {
|
||||
|
||||
static struct platform_driver brcmstb_waketmr_driver = {
|
||||
.probe = brcmstb_waketmr_probe,
|
||||
.remove_new = brcmstb_waketmr_remove,
|
||||
.remove = brcmstb_waketmr_remove,
|
||||
.driver = {
|
||||
.name = "brcmstb-waketimer",
|
||||
.pm = &brcmstb_waketmr_pm_ops,
|
||||
|
||||
@@ -402,7 +402,7 @@ static struct platform_driver cdns_rtc_driver = {
|
||||
.pm = &cdns_rtc_pm_ops,
|
||||
},
|
||||
.probe = cdns_rtc_probe,
|
||||
.remove_new = cdns_rtc_remove,
|
||||
.remove = cdns_rtc_remove,
|
||||
};
|
||||
module_platform_driver(cdns_rtc_driver);
|
||||
|
||||
|
||||
@@ -1527,7 +1527,7 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
|
||||
MODULE_ALIAS("platform:rtc_cmos");
|
||||
|
||||
static struct platform_driver cmos_platform_driver = {
|
||||
.remove_new = cmos_platform_remove,
|
||||
.remove = cmos_platform_remove,
|
||||
.shutdown = cmos_platform_shutdown,
|
||||
.driver = {
|
||||
.name = driver_name,
|
||||
|
||||
@@ -401,7 +401,7 @@ MODULE_DEVICE_TABLE(platform, cros_ec_rtc_id);
|
||||
|
||||
static struct platform_driver cros_ec_rtc_driver = {
|
||||
.probe = cros_ec_rtc_probe,
|
||||
.remove_new = cros_ec_rtc_remove,
|
||||
.remove = cros_ec_rtc_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.pm = &cros_ec_rtc_pm_ops,
|
||||
|
||||
@@ -1354,7 +1354,7 @@ static struct platform_driver ds1685_rtc_driver = {
|
||||
.name = "rtc-ds1685",
|
||||
},
|
||||
.probe = ds1685_rtc_probe,
|
||||
.remove_new = ds1685_rtc_remove,
|
||||
.remove = ds1685_rtc_remove,
|
||||
};
|
||||
module_platform_driver(ds1685_rtc_driver);
|
||||
/* ----------------------------------------------------------------------- */
|
||||
|
||||
@@ -214,7 +214,7 @@ static struct platform_driver ftrtc010_rtc_driver = {
|
||||
.of_match_table = ftrtc010_rtc_dt_match,
|
||||
},
|
||||
.probe = ftrtc010_rtc_probe,
|
||||
.remove_new = ftrtc010_rtc_remove,
|
||||
.remove = ftrtc010_rtc_remove,
|
||||
};
|
||||
|
||||
module_platform_driver_probe(ftrtc010_rtc_driver, ftrtc010_rtc_probe);
|
||||
|
||||
@@ -319,7 +319,7 @@ static struct platform_driver hid_time_platform_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
},
|
||||
.probe = hid_time_probe,
|
||||
.remove_new = hid_time_remove,
|
||||
.remove = hid_time_remove,
|
||||
};
|
||||
module_platform_driver(hid_time_platform_driver);
|
||||
|
||||
|
||||
@@ -860,7 +860,7 @@ static struct platform_driver dryice_rtc_driver __refdata = {
|
||||
.name = "imxdi_rtc",
|
||||
.of_match_table = dryice_dt_ids,
|
||||
},
|
||||
.remove_new = __exit_p(dryice_rtc_remove),
|
||||
.remove = __exit_p(dryice_rtc_remove),
|
||||
};
|
||||
|
||||
module_platform_driver_probe(dryice_rtc_driver, dryice_rtc_probe);
|
||||
|
||||
@@ -381,7 +381,7 @@ MODULE_DEVICE_TABLE(acpi, loongson_rtc_acpi_match);
|
||||
|
||||
static struct platform_driver loongson_rtc_driver = {
|
||||
.probe = loongson_rtc_probe,
|
||||
.remove_new = loongson_rtc_remove,
|
||||
.remove = loongson_rtc_remove,
|
||||
.driver = {
|
||||
.name = "loongson-rtc",
|
||||
.of_match_table = loongson_rtc_of_match,
|
||||
|
||||
@@ -285,7 +285,7 @@ MODULE_DEVICE_TABLE(of, lpc24xx_rtc_match);
|
||||
|
||||
static struct platform_driver lpc24xx_rtc_driver = {
|
||||
.probe = lpc24xx_rtc_probe,
|
||||
.remove_new = lpc24xx_rtc_remove,
|
||||
.remove = lpc24xx_rtc_remove,
|
||||
.driver = {
|
||||
.name = "lpc24xx-rtc",
|
||||
.of_match_table = lpc24xx_rtc_match,
|
||||
|
||||
@@ -875,7 +875,7 @@ static struct platform_driver max77686_rtc_driver = {
|
||||
.pm = &max77686_rtc_pm_ops,
|
||||
},
|
||||
.probe = max77686_rtc_probe,
|
||||
.remove_new = max77686_rtc_remove,
|
||||
.remove = max77686_rtc_remove,
|
||||
.id_table = rtc_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@ MODULE_DEVICE_TABLE(platform, mc13xxx_rtc_idtable);
|
||||
|
||||
static struct platform_driver mc13xxx_rtc_driver = {
|
||||
.id_table = mc13xxx_rtc_idtable,
|
||||
.remove_new = mc13xxx_rtc_remove,
|
||||
.remove = mc13xxx_rtc_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
},
|
||||
|
||||
@@ -398,7 +398,7 @@ static struct platform_driver mpc5121_rtc_driver = {
|
||||
.of_match_table = of_match_ptr(mpc5121_rtc_match),
|
||||
},
|
||||
.probe = mpc5121_rtc_probe,
|
||||
.remove_new = mpc5121_rtc_remove,
|
||||
.remove = mpc5121_rtc_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(mpc5121_rtc_driver);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user