bus: 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 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>

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 930d8a3..2916d13 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -1210,7 +1210,7 @@ static struct platform_driver fsl_mc_bus_driver = {
                   .acpi_match_table = fsl_mc_bus_acpi_match_table,
                   },
        .probe = fsl_mc_bus_probe,
-       .remove_new = fsl_mc_bus_remove,
+       .remove = fsl_mc_bus_remove,
        .shutdown = fsl_mc_bus_remove,
 };
 

diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index 09340ad..53dd157 100644 (file)
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -689,6 +689,6 @@ static struct platform_driver hisi_lpc_driver = {
                .acpi_match_table = hisi_lpc_acpi_match,
        },
        .probe = hisi_lpc_probe,
-       .remove_new = hisi_lpc_remove,
+       .remove = hisi_lpc_remove,
 };
 builtin_platform_driver(hisi_lpc_driver);

diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
index 7d7479b..e4dfda7 100644 (file)
--- a/drivers/bus/omap-ocp2scp.c
+++ b/drivers/bus/omap-ocp2scp.c
@@ -101,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
 
 static struct platform_driver omap_ocp2scp_driver = {
        .probe          = omap_ocp2scp_probe,
-       .remove_new     = omap_ocp2scp_remove,
+       .remove         = omap_ocp2scp_remove,
        .driver         = {
                .name   = "omap-ocp2scp",
                .of_match_table = of_match_ptr(omap_ocp2scp_id_table),

diff --git a/drivers/bus/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c
index ee6d299..7f0a8f8 100644 (file)
--- a/drivers/bus/omap_l3_smx.c
+++ b/drivers/bus/omap_l3_smx.c
@@ -273,7 +273,7 @@ static void omap3_l3_remove(struct platform_device *pdev)
 
 static struct platform_driver omap3_l3_driver = {
        .probe          = omap3_l3_probe,
-       .remove_new     = omap3_l3_remove,
+       .remove         = omap3_l3_remove,
        .driver         = {
                .name   = "omap_l3_smx",
                .of_match_table = of_match_ptr(omap3_l3_match),

diff --git a/drivers/bus/qcom-ssc-block-bus.c b/drivers/bus/qcom-ssc-block-bus.c
index 5931974..85d781a 100644 (file)
--- a/drivers/bus/qcom-ssc-block-bus.c
+++ b/drivers/bus/qcom-ssc-block-bus.c
@@ -373,7 +373,7 @@ MODULE_DEVICE_TABLE(of, qcom_ssc_block_bus_of_match);
 
 static struct platform_driver qcom_ssc_block_bus_driver = {
        .probe = qcom_ssc_block_bus_probe,
-       .remove_new = qcom_ssc_block_bus_remove,
+       .remove = qcom_ssc_block_bus_remove,
        .driver = {
                .name = "qcom-ssc-block-bus",
                .of_match_table = qcom_ssc_block_bus_of_match,

diff --git a/drivers/bus/simple-pm-bus.c b/drivers/bus/simple-pm-bus.c
index 50870c8..5dea317 100644 (file)
--- a/drivers/bus/simple-pm-bus.c
+++ b/drivers/bus/simple-pm-bus.c
@@ -128,7 +128,7 @@ MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);
 
 static struct platform_driver simple_pm_bus_driver = {
        .probe = simple_pm_bus_probe,
-       .remove_new = simple_pm_bus_remove,
+       .remove = simple_pm_bus_remove,
        .driver = {
                .name = "simple-pm-bus",
                .of_match_table = simple_pm_bus_of_match,

diff --git a/drivers/bus/sun50i-de2.c b/drivers/bus/sun50i-de2.c
index 3339311..dfe5881 100644 (file)
--- a/drivers/bus/sun50i-de2.c
+++ b/drivers/bus/sun50i-de2.c
@@ -36,7 +36,7 @@ static const struct of_device_id sun50i_de2_bus_of_match[] = {
 
 static struct platform_driver sun50i_de2_bus_driver = {
        .probe = sun50i_de2_bus_probe,
-       .remove_new = sun50i_de2_bus_remove,
+       .remove = sun50i_de2_bus_remove,
        .driver = {
                .name = "sun50i-de2-bus",
                .of_match_table = sun50i_de2_bus_of_match,

diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
index a89d789..7a33c3b 100644 (file)
--- a/drivers/bus/sunxi-rsb.c
+++ b/drivers/bus/sunxi-rsb.c
@@ -832,7 +832,7 @@ MODULE_DEVICE_TABLE(of, sunxi_rsb_of_match_table);
 
 static struct platform_driver sunxi_rsb_driver = {
        .probe = sunxi_rsb_probe,
-       .remove_new = sunxi_rsb_remove,
+       .remove = sunxi_rsb_remove,
        .driver = {
                .name = RSB_CTRL_NAME,
                .of_match_table = sunxi_rsb_of_match_table,

diff --git a/drivers/bus/tegra-aconnect.c b/drivers/bus/tegra-aconnect.c
index de80008..90e3b0a 100644 (file)
--- a/drivers/bus/tegra-aconnect.c
+++ b/drivers/bus/tegra-aconnect.c
@@ -104,7 +104,7 @@ MODULE_DEVICE_TABLE(of, tegra_aconnect_of_match);
 
 static struct platform_driver tegra_aconnect_driver = {
        .probe = tegra_aconnect_probe,
-       .remove_new = tegra_aconnect_remove,
+       .remove = tegra_aconnect_remove,
        .driver = {
                .name = "tegra-aconnect",
                .of_match_table = tegra_aconnect_of_match,

diff --git a/drivers/bus/tegra-gmi.c b/drivers/bus/tegra-gmi.c
index f5d6414..9c09141 100644 (file)
--- a/drivers/bus/tegra-gmi.c
+++ b/drivers/bus/tegra-gmi.c
@@ -303,7 +303,7 @@ MODULE_DEVICE_TABLE(of, tegra_gmi_id_table);
 
 static struct platform_driver tegra_gmi_driver = {
        .probe = tegra_gmi_probe,
-       .remove_new = tegra_gmi_remove,
+       .remove = tegra_gmi_remove,
        .driver = {
                .name           = "tegra-gmi",
                .of_match_table = tegra_gmi_id_table,

diff --git a/drivers/bus/ti-pwmss.c b/drivers/bus/ti-pwmss.c
index 4969c55..1f2cab9 100644 (file)
--- a/drivers/bus/ti-pwmss.c
+++ b/drivers/bus/ti-pwmss.c
@@ -44,7 +44,7 @@ static struct platform_driver pwmss_driver = {
                .of_match_table = pwmss_of_match,
        },
        .probe  = pwmss_probe,
-       .remove_new = pwmss_remove,
+       .remove = pwmss_remove,
 };
 
 module_platform_driver(pwmss_driver);

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 270a94a..f67b927 100644 (file)
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -3345,7 +3345,7 @@ MODULE_DEVICE_TABLE(of, sysc_match);
 
 static struct platform_driver sysc_driver = {
        .probe          = sysc_probe,
-       .remove_new     = sysc_remove,
+       .remove         = sysc_remove,
        .driver         = {
                .name   = "ti-sysc",
                .of_match_table = sysc_match,

diff --git a/drivers/bus/ts-nbus.c b/drivers/bus/ts-nbus.c
index b8af44c..2328c48 100644 (file)
--- a/drivers/bus/ts-nbus.c
+++ b/drivers/bus/ts-nbus.c
@@ -336,7 +336,7 @@ MODULE_DEVICE_TABLE(of, ts_nbus_of_match);
 
 static struct platform_driver ts_nbus_driver = {
        .probe          = ts_nbus_probe,
-       .remove_new     = ts_nbus_remove,
+       .remove         = ts_nbus_remove,
        .driver         = {
                .name   = "ts_nbus",
                .of_match_table = ts_nbus_of_match,