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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Will Deacon <[email protected]>

diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c
index c6ff1bc7d336b813719b7533a42748c1bb534c50..99a0ef9817e05f9057d9872048929c90855c05ac 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 99cc791892bce0bbd11ece39e0725e0712345e3f..f33e9a456e85e950586d7d36c3c2339509c7bae0 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 c76bac668deaf64192eb8fc8e47dd49f686d7d26..1cc3214d6b6da0c308e4608502e302476f5094b5 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 5c66b927886237775d6c7fd513d5e0b8b872f4ed..d5fcea3d4328bedbd1077127d5f577efcbc81266 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 397a46410f7cb785d645b986518cb4affb0e1b68..49bd811c6fd6efdd9f7b6a4d1cf1813c31b1bea9 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 2158a5975c90759f95c6a09476e90cb3b78356df..81e8b97e935350d47a5f23a4a3539d189d73290d 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 7e5f1d4fca0f170e04a370583b5e4bb4983b11ce..619cf937602fb5f51806229a288094ae42a05ebc 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 f2bd25a3470a5d03fb07e829d3be887ac6a731ef..cb4fb59fe04bb95c87ea5c5fe15809b0ab74094c 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 d5fa92ba8373976982a35cd5d706551d885e657e..b1510f660c7a6931823ebac8eeccbade36950d1b 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 3569050f9cf375fecf14053b9a983e75f31bbabc..fd5b787326034069b406ef6bb54803fa4d16fab8 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 746b92330ca7f024b9e72a42a6a3ea9e3e947cdf..b989ffa95d692fce2d42eec08fbc70520c21b8e1 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 fe1a51f64751c9a81013faef16f2dd148c216f83..3c856d9a4e97ac9893fade1845de2391672d1140 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 0e923f94fa5b02943e35c60540d94918c107b495..3f3fb1de11f5b5d4a7ed4430925c299bedf1190e 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 b804e37381134c3f5013f2c3bcc0b82a7086a2b8..a6ebf2ec99d3714825254de1ab5abd5ad075f374 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 21e69b1cdd4d20ae627adb70a9060268fce05c7f..32624872596f212baac0467a94e472858c876635 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 51ba76871097a8623ff46d03d4f87c714b77f6c7..c235b46ce873268114f7384033e0cd8ecbeb8fa4 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 3cdb35c741f95a09fd5d91c4916a95eaba2d19f9..c0f5d7c73e064767b97babe9308bf0cd84fd36e5 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 765bbd61db26ee35c1eb9ea94fa1c74e7eb1bb46..c5f4764ee888ab52b1296dabf78215a2a883bf59 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 94f1ebcd2a275d523010d1e7a1d823e3edc0834e..8860d9f687aec3abffa722b5e8d38e0ef2f38919 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 9e635f3554709bca645fd6a17de18641ffcc42a6..cda55ee35eeeec6e123a247f2fd91dc2aa6d2412 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 980e3051edd72522cd6b494f4ce1e17d5fc7ec05..ea8c857299373db07188a7611a3ce6069bdc8d96 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 faf763d2c95cb8935538f43d05e686285cc923e9..cadd60221b8f76740df5f115b258faabb2a71aa1 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 c01466ae1e3d93383059e02b68407189e1ae7d1a..33b5497bdc06e41c017bef38098a2e6173526bcf 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,