mirror of
https://github.com/torvalds/linux.git
synced 2025-04-12 06:49:52 +00:00
can: Switch back to struct platform_driver::remove()
After commit 0edb555a65d1 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all can drivers 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://patch.msgid.link/20240909072742.381003-2-u.kleine-koenig@baylibre.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
f3b6129b7d
commit
221013afb4
@ -1191,7 +1191,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table);
|
||||
|
||||
static struct platform_driver at91_can_driver = {
|
||||
.probe = at91_can_probe,
|
||||
.remove_new = at91_can_remove,
|
||||
.remove = at91_can_remove,
|
||||
.driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.of_match_table = of_match_ptr(at91_can_dt_ids),
|
||||
|
@ -1092,7 +1092,7 @@ static struct platform_driver bxcan_driver = {
|
||||
.of_match_table = bxcan_of_match,
|
||||
},
|
||||
.probe = bxcan_probe,
|
||||
.remove_new = bxcan_remove,
|
||||
.remove = bxcan_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bxcan_driver);
|
||||
|
@ -476,7 +476,7 @@ static struct platform_driver c_can_plat_driver = {
|
||||
.of_match_table = c_can_of_table,
|
||||
},
|
||||
.probe = c_can_plat_probe,
|
||||
.remove_new = c_can_plat_remove,
|
||||
.remove = c_can_plat_remove,
|
||||
.suspend = c_can_suspend,
|
||||
.resume = c_can_resume,
|
||||
.id_table = c_can_id_table,
|
||||
|
@ -307,7 +307,7 @@ static void cc770_isa_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver cc770_isa_driver = {
|
||||
.probe = cc770_isa_probe,
|
||||
.remove_new = cc770_isa_remove,
|
||||
.remove = cc770_isa_remove,
|
||||
.driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
},
|
||||
|
@ -247,7 +247,7 @@ static struct platform_driver cc770_platform_driver = {
|
||||
.of_match_table = cc770_platform_table,
|
||||
},
|
||||
.probe = cc770_platform_probe,
|
||||
.remove_new = cc770_platform_remove,
|
||||
.remove = cc770_platform_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(cc770_platform_driver);
|
||||
|
@ -111,7 +111,7 @@ MODULE_DEVICE_TABLE(of, ctucan_of_match);
|
||||
|
||||
static struct platform_driver ctucanfd_driver = {
|
||||
.probe = ctucan_platform_probe,
|
||||
.remove_new = ctucan_platform_remove,
|
||||
.remove = ctucan_platform_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.pm = &ctucan_platform_pm_ops,
|
||||
|
@ -2385,7 +2385,7 @@ static struct platform_driver flexcan_driver = {
|
||||
.of_match_table = flexcan_of_match,
|
||||
},
|
||||
.probe = flexcan_probe,
|
||||
.remove_new = flexcan_remove,
|
||||
.remove = flexcan_remove,
|
||||
.id_table = flexcan_id_table,
|
||||
};
|
||||
|
||||
|
@ -1725,7 +1725,7 @@ static struct platform_driver grcan_driver = {
|
||||
.of_match_table = grcan_match,
|
||||
},
|
||||
.probe = grcan_probe,
|
||||
.remove_new = grcan_remove,
|
||||
.remove = grcan_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(grcan_driver);
|
||||
|
@ -1033,7 +1033,7 @@ static struct platform_driver ifi_canfd_plat_driver = {
|
||||
.of_match_table = ifi_canfd_of_table,
|
||||
},
|
||||
.probe = ifi_canfd_plat_probe,
|
||||
.remove_new = ifi_canfd_plat_remove,
|
||||
.remove = ifi_canfd_plat_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(ifi_canfd_plat_driver);
|
||||
|
@ -2049,7 +2049,7 @@ static struct platform_driver ican3_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.probe = ican3_probe,
|
||||
.remove_new = ican3_remove,
|
||||
.remove = ican3_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(ican3_driver);
|
||||
|
@ -231,7 +231,7 @@ static struct platform_driver m_can_plat_driver = {
|
||||
.pm = &m_can_pmops,
|
||||
},
|
||||
.probe = m_can_plat_probe,
|
||||
.remove_new = m_can_plat_remove,
|
||||
.remove = m_can_plat_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(m_can_plat_driver);
|
||||
|
@ -435,7 +435,7 @@ static struct platform_driver mpc5xxx_can_driver = {
|
||||
.of_match_table = mpc5xxx_can_table,
|
||||
},
|
||||
.probe = mpc5xxx_can_probe,
|
||||
.remove_new = mpc5xxx_can_remove,
|
||||
.remove = mpc5xxx_can_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = mpc5xxx_can_suspend,
|
||||
.resume = mpc5xxx_can_resume,
|
||||
|
@ -907,7 +907,7 @@ static struct platform_driver rcar_can_driver = {
|
||||
.pm = &rcar_can_pm_ops,
|
||||
},
|
||||
.probe = rcar_can_probe,
|
||||
.remove_new = rcar_can_remove,
|
||||
.remove = rcar_can_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(rcar_can_driver);
|
||||
|
@ -2118,7 +2118,7 @@ static struct platform_driver rcar_canfd_driver = {
|
||||
.pm = &rcar_canfd_pm_ops,
|
||||
},
|
||||
.probe = rcar_canfd_probe,
|
||||
.remove_new = rcar_canfd_remove,
|
||||
.remove = rcar_canfd_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(rcar_canfd_driver);
|
||||
|
@ -245,7 +245,7 @@ static void sja1000_isa_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver sja1000_isa_driver = {
|
||||
.probe = sja1000_isa_probe,
|
||||
.remove_new = sja1000_isa_remove,
|
||||
.remove = sja1000_isa_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
|
@ -329,7 +329,7 @@ static void sp_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver sp_driver = {
|
||||
.probe = sp_probe,
|
||||
.remove_new = sp_remove,
|
||||
.remove = sp_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.of_match_table = sp_of_table,
|
||||
|
@ -854,7 +854,7 @@ static struct platform_driver softing_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
},
|
||||
.probe = softing_pdev_probe,
|
||||
.remove_new = softing_pdev_remove,
|
||||
.remove = softing_pdev_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(softing_driver);
|
||||
|
@ -914,7 +914,7 @@ static struct platform_driver sun4i_can_driver = {
|
||||
.of_match_table = sun4ican_of_match,
|
||||
},
|
||||
.probe = sun4ican_probe,
|
||||
.remove_new = sun4ican_remove,
|
||||
.remove = sun4ican_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(sun4i_can_driver);
|
||||
|
@ -1025,7 +1025,7 @@ static struct platform_driver ti_hecc_driver = {
|
||||
.of_match_table = ti_hecc_dt_ids,
|
||||
},
|
||||
.probe = ti_hecc_probe,
|
||||
.remove_new = ti_hecc_remove,
|
||||
.remove = ti_hecc_remove,
|
||||
.suspend = ti_hecc_suspend,
|
||||
.resume = ti_hecc_resume,
|
||||
};
|
||||
|
@ -2103,7 +2103,7 @@ static void xcan_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver xcan_driver = {
|
||||
.probe = xcan_probe,
|
||||
.remove_new = xcan_remove,
|
||||
.remove = xcan_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.pm = &xcan_dev_pm_ops,
|
||||
|
Loading…
x
Reference in New Issue
Block a user