bus: 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/bus 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>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Uwe Kleine-König 2024-11-12 09:35:19 +01:00 committed by Arnd Bergmann
parent 71ad2b07a8
commit 1fac9f8b7d
13 changed files with 13 additions and 13 deletions

View File

@ -1210,7 +1210,7 @@ static struct platform_driver fsl_mc_bus_driver = {
.acpi_match_table = fsl_mc_bus_acpi_match_table, .acpi_match_table = fsl_mc_bus_acpi_match_table,
}, },
.probe = fsl_mc_bus_probe, .probe = fsl_mc_bus_probe,
.remove_new = fsl_mc_bus_remove, .remove = fsl_mc_bus_remove,
.shutdown = fsl_mc_bus_remove, .shutdown = fsl_mc_bus_remove,
}; };

View File

@ -689,6 +689,6 @@ static struct platform_driver hisi_lpc_driver = {
.acpi_match_table = hisi_lpc_acpi_match, .acpi_match_table = hisi_lpc_acpi_match,
}, },
.probe = hisi_lpc_probe, .probe = hisi_lpc_probe,
.remove_new = hisi_lpc_remove, .remove = hisi_lpc_remove,
}; };
builtin_platform_driver(hisi_lpc_driver); builtin_platform_driver(hisi_lpc_driver);

View File

@ -101,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
static struct platform_driver omap_ocp2scp_driver = { static struct platform_driver omap_ocp2scp_driver = {
.probe = omap_ocp2scp_probe, .probe = omap_ocp2scp_probe,
.remove_new = omap_ocp2scp_remove, .remove = omap_ocp2scp_remove,
.driver = { .driver = {
.name = "omap-ocp2scp", .name = "omap-ocp2scp",
.of_match_table = of_match_ptr(omap_ocp2scp_id_table), .of_match_table = of_match_ptr(omap_ocp2scp_id_table),

View File

@ -273,7 +273,7 @@ static void omap3_l3_remove(struct platform_device *pdev)
static struct platform_driver omap3_l3_driver = { static struct platform_driver omap3_l3_driver = {
.probe = omap3_l3_probe, .probe = omap3_l3_probe,
.remove_new = omap3_l3_remove, .remove = omap3_l3_remove,
.driver = { .driver = {
.name = "omap_l3_smx", .name = "omap_l3_smx",
.of_match_table = of_match_ptr(omap3_l3_match), .of_match_table = of_match_ptr(omap3_l3_match),

View File

@ -373,7 +373,7 @@ MODULE_DEVICE_TABLE(of, qcom_ssc_block_bus_of_match);
static struct platform_driver qcom_ssc_block_bus_driver = { static struct platform_driver qcom_ssc_block_bus_driver = {
.probe = qcom_ssc_block_bus_probe, .probe = qcom_ssc_block_bus_probe,
.remove_new = qcom_ssc_block_bus_remove, .remove = qcom_ssc_block_bus_remove,
.driver = { .driver = {
.name = "qcom-ssc-block-bus", .name = "qcom-ssc-block-bus",
.of_match_table = qcom_ssc_block_bus_of_match, .of_match_table = qcom_ssc_block_bus_of_match,

View File

@ -128,7 +128,7 @@ MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);
static struct platform_driver simple_pm_bus_driver = { static struct platform_driver simple_pm_bus_driver = {
.probe = simple_pm_bus_probe, .probe = simple_pm_bus_probe,
.remove_new = simple_pm_bus_remove, .remove = simple_pm_bus_remove,
.driver = { .driver = {
.name = "simple-pm-bus", .name = "simple-pm-bus",
.of_match_table = simple_pm_bus_of_match, .of_match_table = simple_pm_bus_of_match,

View File

@ -36,7 +36,7 @@ static const struct of_device_id sun50i_de2_bus_of_match[] = {
static struct platform_driver sun50i_de2_bus_driver = { static struct platform_driver sun50i_de2_bus_driver = {
.probe = sun50i_de2_bus_probe, .probe = sun50i_de2_bus_probe,
.remove_new = sun50i_de2_bus_remove, .remove = sun50i_de2_bus_remove,
.driver = { .driver = {
.name = "sun50i-de2-bus", .name = "sun50i-de2-bus",
.of_match_table = sun50i_de2_bus_of_match, .of_match_table = sun50i_de2_bus_of_match,

View File

@ -832,7 +832,7 @@ MODULE_DEVICE_TABLE(of, sunxi_rsb_of_match_table);
static struct platform_driver sunxi_rsb_driver = { static struct platform_driver sunxi_rsb_driver = {
.probe = sunxi_rsb_probe, .probe = sunxi_rsb_probe,
.remove_new = sunxi_rsb_remove, .remove = sunxi_rsb_remove,
.driver = { .driver = {
.name = RSB_CTRL_NAME, .name = RSB_CTRL_NAME,
.of_match_table = sunxi_rsb_of_match_table, .of_match_table = sunxi_rsb_of_match_table,

View File

@ -104,7 +104,7 @@ MODULE_DEVICE_TABLE(of, tegra_aconnect_of_match);
static struct platform_driver tegra_aconnect_driver = { static struct platform_driver tegra_aconnect_driver = {
.probe = tegra_aconnect_probe, .probe = tegra_aconnect_probe,
.remove_new = tegra_aconnect_remove, .remove = tegra_aconnect_remove,
.driver = { .driver = {
.name = "tegra-aconnect", .name = "tegra-aconnect",
.of_match_table = tegra_aconnect_of_match, .of_match_table = tegra_aconnect_of_match,

View File

@ -303,7 +303,7 @@ MODULE_DEVICE_TABLE(of, tegra_gmi_id_table);
static struct platform_driver tegra_gmi_driver = { static struct platform_driver tegra_gmi_driver = {
.probe = tegra_gmi_probe, .probe = tegra_gmi_probe,
.remove_new = tegra_gmi_remove, .remove = tegra_gmi_remove,
.driver = { .driver = {
.name = "tegra-gmi", .name = "tegra-gmi",
.of_match_table = tegra_gmi_id_table, .of_match_table = tegra_gmi_id_table,

View File

@ -44,7 +44,7 @@ static struct platform_driver pwmss_driver = {
.of_match_table = pwmss_of_match, .of_match_table = pwmss_of_match,
}, },
.probe = pwmss_probe, .probe = pwmss_probe,
.remove_new = pwmss_remove, .remove = pwmss_remove,
}; };
module_platform_driver(pwmss_driver); module_platform_driver(pwmss_driver);

View File

@ -3345,7 +3345,7 @@ MODULE_DEVICE_TABLE(of, sysc_match);
static struct platform_driver sysc_driver = { static struct platform_driver sysc_driver = {
.probe = sysc_probe, .probe = sysc_probe,
.remove_new = sysc_remove, .remove = sysc_remove,
.driver = { .driver = {
.name = "ti-sysc", .name = "ti-sysc",
.of_match_table = sysc_match, .of_match_table = sysc_match,

View File

@ -336,7 +336,7 @@ MODULE_DEVICE_TABLE(of, ts_nbus_of_match);
static struct platform_driver ts_nbus_driver = { static struct platform_driver ts_nbus_driver = {
.probe = ts_nbus_probe, .probe = ts_nbus_probe,
.remove_new = ts_nbus_remove, .remove = ts_nbus_remove,
.driver = { .driver = {
.name = "ts_nbus", .name = "ts_nbus",
.of_match_table = ts_nbus_of_match, .of_match_table = ts_nbus_of_match,