perf: 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/perf 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://lore.kernel.org/r/20241027180313.410964-2-u.kleine-koenig@baylibre.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c
index c6ff1bc..99a0ef9 100644 (file)
--- a/drivers/perf/alibaba_uncore_drw_pmu.c
+++ b/drivers/perf/alibaba_uncore_drw_pmu.c
@@ -782,7 +782,7 @@ static struct platform_driver ali_drw_pmu_driver = {
                   .acpi_match_table = ali_drw_acpi_match,
                   },
        .probe = ali_drw_pmu_probe,
-       .remove_new = ali_drw_pmu_remove,
+       .remove = ali_drw_pmu_remove,
 };
 
 static int __init ali_drw_pmu_init(void)

diff --git a/drivers/perf/amlogic/meson_g12_ddr_pmu.c b/drivers/perf/amlogic/meson_g12_ddr_pmu.c
index 99cc791..f33e9a4 100644 (file)
--- a/drivers/perf/amlogic/meson_g12_ddr_pmu.c
+++ b/drivers/perf/amlogic/meson_g12_ddr_pmu.c
@@ -379,7 +379,7 @@ MODULE_DEVICE_TABLE(of, meson_ddr_pmu_dt_match);
 
 static struct platform_driver g12_ddr_pmu_driver = {
        .probe = g12_ddr_pmu_probe,
-       .remove_new = g12_ddr_pmu_remove,
+       .remove = g12_ddr_pmu_remove,
 
        .driver = {
                .name = "meson-g12-ddr-pmu",

diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
index c76bac6..1cc3214 100644 (file)
--- a/drivers/perf/arm-cci.c
+++ b/drivers/perf/arm-cci.c
@@ -1705,7 +1705,7 @@ static struct platform_driver cci_pmu_driver = {
                   .suppress_bind_attrs = true,
                  },
        .probe = cci_pmu_probe,
-       .remove_new = cci_pmu_remove,
+       .remove = cci_pmu_remove,
 };
 
 module_platform_driver(cci_pmu_driver);

diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 5c66b92..d5fcea3 100644 (file)
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -1529,7 +1529,7 @@ static struct platform_driver arm_ccn_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = arm_ccn_probe,
-       .remove_new = arm_ccn_remove,
+       .remove = arm_ccn_remove,
 };
 
 static int __init arm_ccn_init(void)

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 397a464..49bd811 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -2662,7 +2662,7 @@ static struct platform_driver arm_cmn_driver = {
                .acpi_match_table = ACPI_PTR(arm_cmn_acpi_match),
        },
        .probe = arm_cmn_probe,
-       .remove_new = arm_cmn_remove,
+       .remove = arm_cmn_remove,
 };
 
 static int __init arm_cmn_init(void)

diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
index 2158a59..81e8b97 100644 (file)
--- a/drivers/perf/arm_cspmu/arm_cspmu.c
+++ b/drivers/perf/arm_cspmu/arm_cspmu.c
@@ -1282,7 +1282,7 @@ static struct platform_driver arm_cspmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = arm_cspmu_device_probe,
-       .remove_new = arm_cspmu_device_remove,
+       .remove = arm_cspmu_device_remove,
        .id_table = arm_cspmu_id,
 };
 

diff --git a/drivers/perf/arm_dmc620_pmu.c b/drivers/perf/arm_dmc620_pmu.c
index 7e5f1d4..619cf93 100644 (file)
--- a/drivers/perf/arm_dmc620_pmu.c
+++ b/drivers/perf/arm_dmc620_pmu.c
@@ -750,7 +750,7 @@ static struct platform_driver dmc620_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe  = dmc620_pmu_device_probe,
-       .remove_new = dmc620_pmu_device_remove,
+       .remove = dmc620_pmu_device_remove,
 };
 
 static int __init dmc620_pmu_init(void)

diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index f2bd25a..cb4fb59 100644 (file)
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -787,7 +787,7 @@ static struct platform_driver dsu_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = dsu_pmu_device_probe,
-       .remove_new = dsu_pmu_device_remove,
+       .remove = dsu_pmu_device_remove,
 };
 
 static int dsu_pmu_cpu_online(unsigned int cpu, struct hlist_node *node)

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index d5fa92b..b1510f6 100644 (file)
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -996,7 +996,7 @@ static struct platform_driver smmu_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = smmu_pmu_probe,
-       .remove_new = smmu_pmu_remove,
+       .remove = smmu_pmu_remove,
        .shutdown = smmu_pmu_shutdown,
 };
 

diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
index 3569050..fd5b787 100644 (file)
--- a/drivers/perf/arm_spe_pmu.c
+++ b/drivers/perf/arm_spe_pmu.c
@@ -1280,7 +1280,7 @@ static struct platform_driver arm_spe_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe  = arm_spe_pmu_device_probe,
-       .remove_new = arm_spe_pmu_device_remove,
+       .remove = arm_spe_pmu_device_remove,
 };
 
 static int __init arm_spe_pmu_init(void)

diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c
index 746b923..b989ffa 100644 (file)
--- a/drivers/perf/fsl_imx8_ddr_perf.c
+++ b/drivers/perf/fsl_imx8_ddr_perf.c
@@ -846,7 +846,7 @@ static struct platform_driver imx_ddr_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = ddr_perf_probe,
-       .remove_new     = ddr_perf_remove,
+       .remove         = ddr_perf_remove,
 };
 
 module_platform_driver(imx_ddr_pmu_driver);

diff --git a/drivers/perf/fsl_imx9_ddr_perf.c b/drivers/perf/fsl_imx9_ddr_perf.c
index fe1a51f..3c856d9 100644 (file)
--- a/drivers/perf/fsl_imx9_ddr_perf.c
+++ b/drivers/perf/fsl_imx9_ddr_perf.c
@@ -853,7 +853,7 @@ static struct platform_driver imx_ddr_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = ddr_perf_probe,
-       .remove_new     = ddr_perf_remove,
+       .remove         = ddr_perf_remove,
 };
 module_platform_driver(imx_ddr_pmu_driver);
 

diff --git a/drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c b/drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c
index 0e923f9..3f3fb1d 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c
@@ -358,7 +358,7 @@ static struct platform_driver hisi_cpa_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_cpa_pmu_probe,
-       .remove_new = hisi_cpa_pmu_remove,
+       .remove = hisi_cpa_pmu_remove,
 };
 
 static int __init hisi_cpa_pmu_module_init(void)

diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
index b804e37..a6ebf2e 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
@@ -547,7 +547,7 @@ static struct platform_driver hisi_ddrc_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_ddrc_pmu_probe,
-       .remove_new = hisi_ddrc_pmu_remove,
+       .remove = hisi_ddrc_pmu_remove,
 };
 
 static int __init hisi_ddrc_pmu_module_init(void)

diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
index 21e69b1..3262487 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
@@ -550,7 +550,7 @@ static struct platform_driver hisi_hha_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_hha_pmu_probe,
-       .remove_new = hisi_hha_pmu_remove,
+       .remove = hisi_hha_pmu_remove,
 };
 
 static int __init hisi_hha_pmu_module_init(void)

diff --git a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
index 51ba768..c235b46 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
@@ -584,7 +584,7 @@ static struct platform_driver hisi_l3c_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_l3c_pmu_probe,
-       .remove_new = hisi_l3c_pmu_remove,
+       .remove = hisi_l3c_pmu_remove,
 };
 
 static int __init hisi_l3c_pmu_module_init(void)

diff --git a/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
index 3cdb35c..c0f5d7c 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
@@ -538,7 +538,7 @@ static struct platform_driver hisi_pa_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_pa_pmu_probe,
-       .remove_new = hisi_pa_pmu_remove,
+       .remove = hisi_pa_pmu_remove,
 };
 
 static int __init hisi_pa_pmu_module_init(void)

diff --git a/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
index 765bbd6..c5f4764 100644 (file)
--- a/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
@@ -476,7 +476,7 @@ static struct platform_driver hisi_sllc_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = hisi_sllc_pmu_probe,
-       .remove_new = hisi_sllc_pmu_remove,
+       .remove = hisi_sllc_pmu_remove,
 };
 
 static int __init hisi_sllc_pmu_module_init(void)

diff --git a/drivers/perf/marvell_cn10k_ddr_pmu.c b/drivers/perf/marvell_cn10k_ddr_pmu.c
index 94f1ebc..8860d9f 100644 (file)
--- a/drivers/perf/marvell_cn10k_ddr_pmu.c
+++ b/drivers/perf/marvell_cn10k_ddr_pmu.c
@@ -732,7 +732,7 @@ static struct platform_driver cn10k_ddr_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = cn10k_ddr_perf_probe,
-       .remove_new     = cn10k_ddr_perf_remove,
+       .remove         = cn10k_ddr_perf_remove,
 };
 
 static int __init cn10k_ddr_pmu_init(void)

diff --git a/drivers/perf/marvell_cn10k_tad_pmu.c b/drivers/perf/marvell_cn10k_tad_pmu.c
index 9e635f3..cda55ee 100644 (file)
--- a/drivers/perf/marvell_cn10k_tad_pmu.c
+++ b/drivers/perf/marvell_cn10k_tad_pmu.c
@@ -383,7 +383,7 @@ static struct platform_driver tad_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = tad_pmu_probe,
-       .remove_new     = tad_pmu_remove,
+       .remove         = tad_pmu_remove,
 };
 
 static int tad_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)

diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index 980e305..ea8c857 100644 (file)
--- a/drivers/perf/qcom_l2_pmu.c
+++ b/drivers/perf/qcom_l2_pmu.c
@@ -981,7 +981,7 @@ static struct platform_driver l2_cache_pmu_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = l2_cache_pmu_probe,
-       .remove_new = l2_cache_pmu_remove,
+       .remove = l2_cache_pmu_remove,
 };
 
 static int __init register_l2_cache_pmu_driver(void)

diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c
index faf763d..cadd602 100644 (file)
--- a/drivers/perf/thunderx2_pmu.c
+++ b/drivers/perf/thunderx2_pmu.c
@@ -1010,7 +1010,7 @@ static struct platform_driver tx2_uncore_driver = {
                .suppress_bind_attrs = true,
        },
        .probe = tx2_uncore_probe,
-       .remove_new = tx2_uncore_remove,
+       .remove = tx2_uncore_remove,
 };
 
 static int __init tx2_uncore_driver_init(void)

diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index c01466a..33b5497 100644 (file)
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -1943,7 +1943,7 @@ static void xgene_pmu_remove(struct platform_device *pdev)
 
 static struct platform_driver xgene_pmu_driver = {
        .probe = xgene_pmu_probe,
-       .remove_new = xgene_pmu_remove,
+       .remove = xgene_pmu_remove,
        .driver = {
                .name           = "xgene-pmu",
                .of_match_table = xgene_pmu_of_match,