soc: 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/soc 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.

On the way do a few whitespace changes to make indention consistent.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Herve Codina <herve.codina@bootlin.com> # for fsl/qe/{qmc,tsa}.c
Acked-by: Bjorn Andersson <andersson@kernel.org> # qcom parts
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Acked-by: Andrew Jeffery <andrew@codeconstruct.com.au> # aspeed
Link: https://lore.kernel.org/r/20241029074859.509587-2-u.kleine-koenig@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
index e870380..ee58151 100644 (file)
--- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
@@ -353,7 +353,7 @@ static struct platform_driver aspeed_lpc_ctrl_driver = {
                .of_match_table = aspeed_lpc_ctrl_match,
        },
        .probe = aspeed_lpc_ctrl_probe,
-       .remove_new = aspeed_lpc_ctrl_remove,
+       .remove = aspeed_lpc_ctrl_remove,
 };
 
 module_platform_driver(aspeed_lpc_ctrl_driver);

diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c
index 888b584..9ab5ba9 100644 (file)
--- a/drivers/soc/aspeed/aspeed-lpc-snoop.c
+++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c
@@ -366,7 +366,7 @@ static struct platform_driver aspeed_lpc_snoop_driver = {
                .of_match_table = aspeed_lpc_snoop_match,
        },
        .probe = aspeed_lpc_snoop_probe,
-       .remove_new = aspeed_lpc_snoop_remove,
+       .remove = aspeed_lpc_snoop_remove,
 };
 
 module_platform_driver(aspeed_lpc_snoop_driver);

diff --git a/drivers/soc/aspeed/aspeed-p2a-ctrl.c b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
index 8610dda..6cc9437 100644 (file)
--- a/drivers/soc/aspeed/aspeed-p2a-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
@@ -431,7 +431,7 @@ static struct platform_driver aspeed_p2a_ctrl_driver = {
                .of_match_table = aspeed_p2a_ctrl_match,
        },
        .probe = aspeed_p2a_ctrl_probe,
-       .remove_new = aspeed_p2a_ctrl_remove,
+       .remove = aspeed_p2a_ctrl_remove,
 };
 
 module_platform_driver(aspeed_p2a_ctrl_driver);

diff --git a/drivers/soc/aspeed/aspeed-uart-routing.c b/drivers/soc/aspeed/aspeed-uart-routing.c
index a2195f0..0191e36 100644 (file)
--- a/drivers/soc/aspeed/aspeed-uart-routing.c
+++ b/drivers/soc/aspeed/aspeed-uart-routing.c
@@ -589,7 +589,7 @@ static struct platform_driver aspeed_uart_routing_driver = {
                .of_match_table = aspeed_uart_routing_table,
        },
        .probe = aspeed_uart_routing_probe,
-       .remove_new = aspeed_uart_routing_remove,
+       .remove = aspeed_uart_routing_remove,
 };
 
 module_platform_driver(aspeed_uart_routing_driver);

diff --git a/drivers/soc/fsl/dpaa2-console.c b/drivers/soc/fsl/dpaa2-console.c
index 6dbc77d..6310f54 100644 (file)
--- a/drivers/soc/fsl/dpaa2-console.c
+++ b/drivers/soc/fsl/dpaa2-console.c
@@ -320,7 +320,7 @@ static struct platform_driver dpaa2_console_driver = {
                   .of_match_table = dpaa2_console_match_table,
                   },
        .probe = dpaa2_console_probe,
-       .remove_new = dpaa2_console_remove,
+       .remove = dpaa2_console_remove,
 };
 module_platform_driver(dpaa2_console_driver);
 

diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c
index 19cc581..29d7fd7 100644 (file)
--- a/drivers/soc/fsl/qe/qmc.c
+++ b/drivers/soc/fsl/qe/qmc.c
@@ -2092,7 +2092,7 @@ static struct platform_driver qmc_driver = {
                .of_match_table = of_match_ptr(qmc_id_table),
        },
        .probe = qmc_probe,
-       .remove_new = qmc_remove,
+       .remove = qmc_remove,
 };
 module_platform_driver(qmc_driver);
 

diff --git a/drivers/soc/fsl/qe/tsa.c b/drivers/soc/fsl/qe/tsa.c
index f0889b3..515da9b 100644 (file)
--- a/drivers/soc/fsl/qe/tsa.c
+++ b/drivers/soc/fsl/qe/tsa.c
@@ -1086,7 +1086,7 @@ static struct platform_driver tsa_driver = {
                .of_match_table = of_match_ptr(tsa_id_table),
        },
        .probe = tsa_probe,
-       .remove_new = tsa_remove,
+       .remove = tsa_remove,
 };
 module_platform_driver(tsa_driver);
 

diff --git a/drivers/soc/fujitsu/a64fx-diag.c b/drivers/soc/fujitsu/a64fx-diag.c
index 3309018..76cb0b6 100644 (file)
--- a/drivers/soc/fujitsu/a64fx-diag.c
+++ b/drivers/soc/fujitsu/a64fx-diag.c
@@ -142,7 +142,7 @@ static struct platform_driver a64fx_diag_driver = {
                .acpi_match_table = ACPI_PTR(a64fx_diag_acpi_match),
        },
        .probe = a64fx_diag_probe,
-       .remove_new = a64fx_diag_remove,
+       .remove = a64fx_diag_remove,
 };
 
 module_platform_driver(a64fx_diag_driver);

diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c
index e882a61..8f51e59 100644 (file)
--- a/drivers/soc/hisilicon/kunpeng_hccs.c
+++ b/drivers/soc/hisilicon/kunpeng_hccs.c
@@ -1348,7 +1348,7 @@ MODULE_DEVICE_TABLE(acpi, hccs_acpi_match);
 
 static struct platform_driver hccs_driver = {
        .probe = hccs_probe,
-       .remove_new = hccs_remove,
+       .remove = hccs_remove,
        .driver = {
                .name = "kunpeng_hccs",
                .acpi_match_table = hccs_acpi_match,

diff --git a/drivers/soc/ixp4xx/ixp4xx-npe.c b/drivers/soc/ixp4xx/ixp4xx-npe.c
index 34a6f18..33e2e03 100644 (file)
--- a/drivers/soc/ixp4xx/ixp4xx-npe.c
+++ b/drivers/soc/ixp4xx/ixp4xx-npe.c
@@ -759,7 +759,7 @@ static struct platform_driver ixp4xx_npe_driver = {
                .of_match_table = ixp4xx_npe_of_match,
        },
        .probe = ixp4xx_npe_probe,
-       .remove_new = ixp4xx_npe_remove,
+       .remove = ixp4xx_npe_remove,
 };
 module_platform_driver(ixp4xx_npe_driver);
 

diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
index cb112f3..475e229 100644 (file)
--- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c
+++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
@@ -461,7 +461,7 @@ static struct platform_driver ixp4xx_qmgr_driver = {
                .of_match_table = ixp4xx_qmgr_of_match,
        },
        .probe = ixp4xx_qmgr_probe,
-       .remove_new = ixp4xx_qmgr_remove,
+       .remove = ixp4xx_qmgr_remove,
 };
 module_platform_driver(ixp4xx_qmgr_driver);
 

diff --git a/drivers/soc/litex/litex_soc_ctrl.c b/drivers/soc/litex/litex_soc_ctrl.c
index 72c4411..d08bfc8 100644 (file)
--- a/drivers/soc/litex/litex_soc_ctrl.c
+++ b/drivers/soc/litex/litex_soc_ctrl.c
@@ -131,7 +131,7 @@ static struct platform_driver litex_soc_ctrl_driver = {
                .of_match_table = litex_soc_ctrl_of_match,
        },
        .probe = litex_soc_ctrl_probe,
-       .remove_new = litex_soc_ctrl_remove,
+       .remove = litex_soc_ctrl_remove,
 };
 
 module_platform_driver(litex_soc_ctrl_driver);

diff --git a/drivers/soc/loongson/loongson2_guts.c b/drivers/soc/loongson/loongson2_guts.c
index ef352a0..ae42e3a 100644 (file)
--- a/drivers/soc/loongson/loongson2_guts.c
+++ b/drivers/soc/loongson/loongson2_guts.c
@@ -169,7 +169,7 @@ static struct platform_driver loongson2_guts_driver = {
                .of_match_table = loongson2_guts_of_match,
        },
        .probe = loongson2_guts_probe,
-       .remove_new = loongson2_guts_remove,
+       .remove = loongson2_guts_remove,
 };
 
 static int __init loongson2_guts_init(void)

diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c
index 56cc345..2a1adcb 100644 (file)
--- a/drivers/soc/mediatek/mtk-devapc.c
+++ b/drivers/soc/mediatek/mtk-devapc.c
@@ -301,7 +301,7 @@ static void mtk_devapc_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_devapc_driver = {
        .probe = mtk_devapc_probe,
-       .remove_new = mtk_devapc_remove,
+       .remove = mtk_devapc_remove,
        .driver = {
                .name = "mtk-devapc",
                .of_match_table = mtk_devapc_dt_match,

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 9382407..bb4639c 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -487,7 +487,7 @@ static struct platform_driver mtk_mmsys_drv = {
                .of_match_table = of_match_mtk_mmsys,
        },
        .probe = mtk_mmsys_probe,
-       .remove_new = mtk_mmsys_remove,
+       .remove = mtk_mmsys_remove,
 };
 module_platform_driver(mtk_mmsys_drv);
 

diff --git a/drivers/soc/mediatek/mtk-socinfo.c b/drivers/soc/mediatek/mtk-socinfo.c
index 74672a9..123b12c 100644 (file)
--- a/drivers/soc/mediatek/mtk-socinfo.c
+++ b/drivers/soc/mediatek/mtk-socinfo.c
@@ -187,7 +187,7 @@ static void mtk_socinfo_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_socinfo = {
        .probe = mtk_socinfo_probe,
-       .remove_new = mtk_socinfo_remove,
+       .remove = mtk_socinfo_remove,
        .driver = {
                .name = "mtk-socinfo",
        },

diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
index 7a49360..30bc45d 100644 (file)
--- a/drivers/soc/microchip/mpfs-sys-controller.c
+++ b/drivers/soc/microchip/mpfs-sys-controller.c
@@ -232,7 +232,7 @@ static struct platform_driver mpfs_sys_controller_driver = {
                .of_match_table = mpfs_sys_controller_of_match,
        },
        .probe = mpfs_sys_controller_probe,
-       .remove_new = mpfs_sys_controller_remove,
+       .remove = mpfs_sys_controller_remove,
 };
 module_platform_driver(mpfs_sys_controller_driver);
 

diff --git a/drivers/soc/pxa/ssp.c b/drivers/soc/pxa/ssp.c
index 854d32e..bb0062c 100644 (file)
--- a/drivers/soc/pxa/ssp.c
+++ b/drivers/soc/pxa/ssp.c
@@ -197,7 +197,7 @@ static const struct platform_device_id ssp_id_table[] = {
 
 static struct platform_driver pxa_ssp_driver = {
        .probe          = pxa_ssp_probe,
-       .remove_new     = pxa_ssp_remove,
+       .remove         = pxa_ssp_remove,
        .driver         = {
                .name           = "pxa2xx-ssp",
                .of_match_table = of_match_ptr(pxa_ssp_of_ids),

diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c
index f9235bc..3dfa448 100644 (file)
--- a/drivers/soc/qcom/icc-bwmon.c
+++ b/drivers/soc/qcom/icc-bwmon.c
@@ -872,7 +872,7 @@ MODULE_DEVICE_TABLE(of, bwmon_of_match);
 
 static struct platform_driver bwmon_driver = {
        .probe = bwmon_probe,
-       .remove_new = bwmon_remove,
+       .remove = bwmon_remove,
        .driver = {
                .name = "qcom-bwmon",
                .of_match_table = bwmon_of_match,

diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index 8fa4ffd..aa90e15 100644 (file)
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -1401,7 +1401,7 @@ static struct platform_driver qcom_llcc_driver = {
                .of_match_table = qcom_llcc_of_match,
        },
        .probe = qcom_llcc_probe,
-       .remove_new = qcom_llcc_remove,
+       .remove = qcom_llcc_remove,
 };
 module_platform_driver(qcom_llcc_driver);
 

diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index ff8df7d..9c3bd37 100644 (file)
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -439,7 +439,7 @@ MODULE_DEVICE_TABLE(of, ocmem_of_match);
 
 static struct platform_driver ocmem_driver = {
        .probe = ocmem_dev_probe,
-       .remove_new = ocmem_dev_remove,
+       .remove = ocmem_dev_remove,
        .driver = {
                .name = "ocmem",
                .of_match_table = ocmem_of_match,

diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c
index 9606222..fa53633 100644 (file)
--- a/drivers/soc/qcom/pmic_glink.c
+++ b/drivers/soc/qcom/pmic_glink.c
@@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(of, pmic_glink_of_match);
 
 static struct platform_driver pmic_glink_driver = {
        .probe = pmic_glink_probe,
-       .remove_new = pmic_glink_remove,
+       .remove = pmic_glink_remove,
        .driver = {
                .name = "qcom_pmic_glink",
                .of_match_table = pmic_glink_of_match,

diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c
index 60af266..0320ad3 100644 (file)
--- a/drivers/soc/qcom/qcom_aoss.c
+++ b/drivers/soc/qcom/qcom_aoss.c
@@ -664,7 +664,7 @@ static struct platform_driver qmp_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = qmp_probe,
-       .remove_new = qmp_remove,
+       .remove = qmp_remove,
 };
 module_platform_driver(qmp_driver);
 

diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c
index f04b9a3..8f1158e 100644 (file)
--- a/drivers/soc/qcom/qcom_gsbi.c
+++ b/drivers/soc/qcom/qcom_gsbi.c
@@ -232,7 +232,7 @@ static struct platform_driver gsbi_driver = {
                .of_match_table = gsbi_dt_match,
        },
        .probe = gsbi_probe,
-       .remove_new = gsbi_remove,
+       .remove = gsbi_remove,
 };
 
 module_platform_driver(gsbi_driver);

diff --git a/drivers/soc/qcom/qcom_stats.c b/drivers/soc/qcom/qcom_stats.c
index c429d51..5de99cf 100644 (file)
--- a/drivers/soc/qcom/qcom_stats.c
+++ b/drivers/soc/qcom/qcom_stats.c
@@ -274,7 +274,7 @@ MODULE_DEVICE_TABLE(of, qcom_stats_table);
 
 static struct platform_driver qcom_stats = {
        .probe = qcom_stats_probe,
-       .remove_new = qcom_stats_remove,
+       .remove = qcom_stats_remove,
        .driver = {
                .name = "qcom_stats",
                .of_match_table = qcom_stats_table,

diff --git a/drivers/soc/qcom/ramp_controller.c b/drivers/soc/qcom/ramp_controller.c
index e9a0cca..349bdfb 100644 (file)
--- a/drivers/soc/qcom/ramp_controller.c
+++ b/drivers/soc/qcom/ramp_controller.c
@@ -331,8 +331,8 @@ static struct platform_driver qcom_ramp_controller_driver = {
                .of_match_table = qcom_ramp_controller_match_table,
                .suppress_bind_attrs = true,
        },
-       .probe  = qcom_ramp_controller_probe,
-       .remove_new = qcom_ramp_controller_remove,
+       .probe = qcom_ramp_controller_probe,
+       .remove = qcom_ramp_controller_remove,
 };
 
 static int __init qcom_ramp_controller_init(void)

diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
index df850d0..33603b8 100644 (file)
--- a/drivers/soc/qcom/rmtfs_mem.c
+++ b/drivers/soc/qcom/rmtfs_mem.c
@@ -315,7 +315,7 @@ MODULE_DEVICE_TABLE(of, qcom_rmtfs_mem_of_match);
 
 static struct platform_driver qcom_rmtfs_mem_driver = {
        .probe = qcom_rmtfs_mem_probe,
-       .remove_new = qcom_rmtfs_mem_remove,
+       .remove = qcom_rmtfs_mem_remove,
        .driver  = {
                .name  = "qcom_rmtfs_mem",
                .of_match_table = qcom_rmtfs_mem_of_match,

diff --git a/drivers/soc/qcom/rpm-proc.c b/drivers/soc/qcom/rpm-proc.c
index 2995d9b..2466d04 100644 (file)
--- a/drivers/soc/qcom/rpm-proc.c
+++ b/drivers/soc/qcom/rpm-proc.c
@@ -53,7 +53,7 @@ MODULE_DEVICE_TABLE(of, rpm_proc_of_match);
 
 static struct platform_driver rpm_proc_driver = {
        .probe = rpm_proc_probe,
-       .remove_new = rpm_proc_remove,
+       .remove = rpm_proc_remove,
        .driver = {
                .name = "qcom-rpm-proc",
                .of_match_table = rpm_proc_of_match,

diff --git a/drivers/soc/qcom/rpm_master_stats.c b/drivers/soc/qcom/rpm_master_stats.c
index 086fe4b..49e4f94 100644 (file)
--- a/drivers/soc/qcom/rpm_master_stats.c
+++ b/drivers/soc/qcom/rpm_master_stats.c
@@ -155,7 +155,7 @@ static const struct of_device_id rpm_master_table[] = {
 
 static struct platform_driver master_stats_driver = {
        .probe = master_stats_probe,
-       .remove_new = master_stats_remove,
+       .remove = master_stats_remove,
        .driver = {
                .name = "qcom_rpm_master_stats",
                .of_match_table = rpm_master_table,

diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index e441177..e9c690d 100644 (file)
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -1251,7 +1251,7 @@ MODULE_DEVICE_TABLE(of, qcom_smem_of_match);
 
 static struct platform_driver qcom_smem_driver = {
        .probe = qcom_smem_probe,
-       .remove_new = qcom_smem_remove,
+       .remove = qcom_smem_remove,
        .driver  = {
                .name = "qcom-smem",
                .of_match_table = qcom_smem_of_match,

diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c
index cefcbd6..9295a13 100644 (file)
--- a/drivers/soc/qcom/smp2p.c
+++ b/drivers/soc/qcom/smp2p.c
@@ -698,7 +698,7 @@ MODULE_DEVICE_TABLE(of, qcom_smp2p_of_match);
 
 static struct platform_driver qcom_smp2p_driver = {
        .probe = qcom_smp2p_probe,
-       .remove_new = qcom_smp2p_remove,
+       .remove = qcom_smp2p_remove,
        .driver  = {
                .name  = "qcom_smp2p",
                .of_match_table = qcom_smp2p_of_match,

diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index ffe78ae..e803ea3 100644 (file)
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -682,9 +682,9 @@ MODULE_DEVICE_TABLE(of, qcom_smsm_of_match);
 
 static struct platform_driver qcom_smsm_driver = {
        .probe = qcom_smsm_probe,
-       .remove_new = qcom_smsm_remove,
-       .driver  = {
-               .name  = "qcom-smsm",
+       .remove = qcom_smsm_remove,
+       .driver = {
+               .name = "qcom-smsm",
                .of_match_table = qcom_smsm_of_match,
        },
 };

diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 64fc4f4..6fa4d10 100644 (file)
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -816,7 +816,7 @@ static void qcom_socinfo_remove(struct platform_device *pdev)
 
 static struct platform_driver qcom_socinfo_driver = {
        .probe = qcom_socinfo_probe,
-       .remove_new = qcom_socinfo_remove,
+       .remove = qcom_socinfo_remove,
        .driver  = {
                .name = "qcom-socinfo",
        },

diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
index fd9fd31..f94985a 100644 (file)
--- a/drivers/soc/rockchip/io-domain.c
+++ b/drivers/soc/rockchip/io-domain.c
@@ -742,10 +742,10 @@ static void rockchip_iodomain_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver rockchip_iodomain_driver = {
-       .probe   = rockchip_iodomain_probe,
-       .remove_new = rockchip_iodomain_remove,
-       .driver  = {
-               .name  = "rockchip-iodomain",
+       .probe = rockchip_iodomain_probe,
+       .remove = rockchip_iodomain_remove,
+       .driver = {
+               .name = "rockchip-iodomain",
                .of_match_table = rockchip_iodomain_match,
        },
 };

diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c
index b1118d3..169f94d 100644 (file)
--- a/drivers/soc/samsung/exynos-chipid.c
+++ b/drivers/soc/samsung/exynos-chipid.c
@@ -195,8 +195,8 @@ static struct platform_driver exynos_chipid_driver = {
                .name = "exynos-chipid",
                .of_match_table = exynos_chipid_of_device_ids,
        },
-       .probe  = exynos_chipid_probe,
-       .remove_new = exynos_chipid_remove,
+       .probe = exynos_chipid_probe,
+       .remove = exynos_chipid_remove,
 };
 module_platform_driver(exynos_chipid_driver);
 

diff --git a/drivers/soc/tegra/cbb/tegra194-cbb.c b/drivers/soc/tegra/cbb/tegra194-cbb.c
index 9cbc562..846b17f 100644 (file)
--- a/drivers/soc/tegra/cbb/tegra194-cbb.c
+++ b/drivers/soc/tegra/cbb/tegra194-cbb.c
@@ -2330,7 +2330,7 @@ static const struct dev_pm_ops tegra194_cbb_pm = {
 
 static struct platform_driver tegra194_cbb_driver = {
        .probe = tegra194_cbb_probe,
-       .remove_new = tegra194_cbb_remove,
+       .remove = tegra194_cbb_remove,
        .driver = {
                .name = "tegra194-cbb",
                .of_match_table = of_match_ptr(tegra194_cbb_match),

diff --git a/drivers/soc/ti/k3-ringacc.c b/drivers/soc/ti/k3-ringacc.c
index 8c01029..82a15ca 100644 (file)
--- a/drivers/soc/ti/k3-ringacc.c
+++ b/drivers/soc/ti/k3-ringacc.c
@@ -1562,7 +1562,7 @@ static void k3_ringacc_remove(struct platform_device *pdev)
 
 static struct platform_driver k3_ringacc_driver = {
        .probe          = k3_ringacc_probe,
-       .remove_new     = k3_ringacc_remove,
+       .remove         = k3_ringacc_remove,
        .driver         = {
                .name   = "k3-ringacc",
                .of_match_table = k3_ringacc_of_match,

diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index fb0746d..a25ebe6 100644 (file)
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -783,8 +783,8 @@ MODULE_DEVICE_TABLE(of, of_match);
 
 static struct platform_driver knav_dma_driver = {
        .probe  = knav_dma_probe,
-       .remove_new = knav_dma_remove,
-       .driver = {
+       .remove = knav_dma_remove,
+       .driver = {
                .name           = "keystone-navigator-dma",
                .of_match_table = of_match,
        },

diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index 6c98738..c2ad186 100644 (file)
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1894,7 +1894,7 @@ static void knav_queue_remove(struct platform_device *pdev)
 
 static struct platform_driver keystone_qmss_driver = {
        .probe          = knav_queue_probe,
-       .remove_new     = knav_queue_remove,
+       .remove         = knav_queue_remove,
        .driver         = {
                .name   = "keystone-navigator-qmss",
                .of_match_table = keystone_qmss_of_match,

diff --git a/drivers/soc/ti/pm33xx.c b/drivers/soc/ti/pm33xx.c
index 8169885..dfdff18 100644 (file)
--- a/drivers/soc/ti/pm33xx.c
+++ b/drivers/soc/ti/pm33xx.c
@@ -591,7 +591,7 @@ static struct platform_driver am33xx_pm_driver = {
                .name   = "pm33xx",
        },
        .probe = am33xx_pm_probe,
-       .remove_new = am33xx_pm_remove,
+       .remove = am33xx_pm_remove,
 };
 module_platform_driver(am33xx_pm_driver);
 

diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
index 3ec758f..d7634bf 100644 (file)
--- a/drivers/soc/ti/pruss.c
+++ b/drivers/soc/ti/pruss.c
@@ -593,8 +593,8 @@ static struct platform_driver pruss_driver = {
                .name = "pruss",
                .of_match_table = pruss_of_match,
        },
-       .probe  = pruss_probe,
-       .remove_new = pruss_remove,
+       .probe = pruss_probe,
+       .remove = pruss_remove,
 };
 module_platform_driver(pruss_driver);
 

diff --git a/drivers/soc/ti/smartreflex.c b/drivers/soc/ti/smartreflex.c
index d621906..8b19744 100644 (file)
--- a/drivers/soc/ti/smartreflex.c
+++ b/drivers/soc/ti/smartreflex.c
@@ -969,7 +969,7 @@ MODULE_DEVICE_TABLE(of, omap_sr_match);
 
 static struct platform_driver smartreflex_driver = {
        .probe          = omap_sr_probe,
-       .remove_new     = omap_sr_remove,
+       .remove         = omap_sr_remove,
        .shutdown       = omap_sr_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,

diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c
index 88f774d..79dde9a 100644 (file)
--- a/drivers/soc/ti/wkup_m3_ipc.c
+++ b/drivers/soc/ti/wkup_m3_ipc.c
@@ -755,7 +755,7 @@ MODULE_DEVICE_TABLE(of, wkup_m3_ipc_of_match);
 
 static struct platform_driver wkup_m3_ipc_driver = {
        .probe = wkup_m3_ipc_probe,
-       .remove_new = wkup_m3_ipc_remove,
+       .remove = wkup_m3_ipc_remove,
        .driver = {
                .name = "wkup_m3_ipc",
                .of_match_table = wkup_m3_ipc_of_match,

diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
index f529e13..626b354 100644 (file)
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -709,7 +709,7 @@ static void xlnx_event_manager_remove(struct platform_device *pdev)
 
 static struct platform_driver xlnx_event_manager_driver = {
        .probe = xlnx_event_manager_probe,
-       .remove_new = xlnx_event_manager_remove,
+       .remove = xlnx_event_manager_remove,
        .driver = {
                .name = "xlnx_event_manager",
        },

diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_power.c
index 411d33f..ae59bf1 100644 (file)
--- a/drivers/soc/xilinx/zynqmp_power.c
+++ b/drivers/soc/xilinx/zynqmp_power.c
@@ -408,7 +408,7 @@ MODULE_DEVICE_TABLE(of, pm_of_match);
 
 static struct platform_driver zynqmp_pm_platform_driver = {
        .probe = zynqmp_pm_probe,
-       .remove_new = zynqmp_pm_remove,
+       .remove = zynqmp_pm_remove,
        .driver = {
                .name = "zynqmp_power",
                .of_match_table = pm_of_match,