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 930d8a3ba722b31f8e3f432ccb6de3d01a5feb87..2916d13336499c9803c238f279a9443309d64428 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 09340adbacc2cc23d360215084bfaa7999613a48..53dd1573e3238a68a3b3ffa9aefb925cef514f23 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 7d7479ba0a7599fb92677a740f395bfd7f9ca4f0..e4dfda7b3b1027c3cececdbe4752a7b1fbdef74d 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 ee6d29925e4df739510d3e3bb96d765c809f343a..7f0a8f8b3f4ce7ac4a72ce7f10c3d5a70a8439dd 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 5931974a21fa3aa6adb51d4bfcedbca7ae478d2e..85d781a32df4b28cd56dcb52305450ee7cf70c04 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 50870c8278899269f962943db3f328eb4bccc180..5dea31769f9a8bf934f6173e795c8e84487c4d16 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 3339311ce068346a98dd1ddad82a0e3c63f8c77b..dfe588179acab90b7daff7dd4b1d8e1a36817994 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 a89d789256376754a7b1b7cd826437f8031e602c..7a33c3b31d1e948ca2dfa88ef13c5b59d18f7e74 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 de80008bff92dea7e704484941eaae0fbf9ef93f..90e3b0a108161ec72103d6361224b575ea518366 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 f5d6414df9f2382dbdd7ca8052b4820c24d49ae1..9c09141961d87eee63412cc9fc49949a708a9d4c 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 4969c556e7521baf202127bc5e92fb5ea23d5c03..1f2cab91e438993c8380fd1480845dd50a42cbc2 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 270a94a06e05ce87c96798b80ab9b3f9f23b5f38..f67b927ae4caa896099cb24e3fe931e97c3df568 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 b8af44c5cdbd0d9a044982c3d30f40f97b7e0c61..2328c48b9b1260e805c631f2aa7379d620084537 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,