Skip to content

Commit 845fd2c

Browse files
ukleinekwilldeacon
authored andcommitted
perf: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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>
1 parent 9643aaa commit 845fd2c

23 files changed

+23
-23
lines changed

drivers/perf/alibaba_uncore_drw_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ static struct platform_driver ali_drw_pmu_driver = {
782782
.acpi_match_table = ali_drw_acpi_match,
783783
},
784784
.probe = ali_drw_pmu_probe,
785-
.remove_new = ali_drw_pmu_remove,
785+
.remove = ali_drw_pmu_remove,
786786
};
787787

788788
static int __init ali_drw_pmu_init(void)

drivers/perf/amlogic/meson_g12_ddr_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ MODULE_DEVICE_TABLE(of, meson_ddr_pmu_dt_match);
379379

380380
static struct platform_driver g12_ddr_pmu_driver = {
381381
.probe = g12_ddr_pmu_probe,
382-
.remove_new = g12_ddr_pmu_remove,
382+
.remove = g12_ddr_pmu_remove,
383383

384384
.driver = {
385385
.name = "meson-g12-ddr-pmu",

drivers/perf/arm-cci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ static struct platform_driver cci_pmu_driver = {
17051705
.suppress_bind_attrs = true,
17061706
},
17071707
.probe = cci_pmu_probe,
1708-
.remove_new = cci_pmu_remove,
1708+
.remove = cci_pmu_remove,
17091709
};
17101710

17111711
module_platform_driver(cci_pmu_driver);

drivers/perf/arm-ccn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ static struct platform_driver arm_ccn_driver = {
15291529
.suppress_bind_attrs = true,
15301530
},
15311531
.probe = arm_ccn_probe,
1532-
.remove_new = arm_ccn_remove,
1532+
.remove = arm_ccn_remove,
15331533
};
15341534

15351535
static int __init arm_ccn_init(void)

drivers/perf/arm-cmn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2662,7 +2662,7 @@ static struct platform_driver arm_cmn_driver = {
26622662
.acpi_match_table = ACPI_PTR(arm_cmn_acpi_match),
26632663
},
26642664
.probe = arm_cmn_probe,
2665-
.remove_new = arm_cmn_remove,
2665+
.remove = arm_cmn_remove,
26662666
};
26672667

26682668
static int __init arm_cmn_init(void)

drivers/perf/arm_cspmu/arm_cspmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ static struct platform_driver arm_cspmu_driver = {
12821282
.suppress_bind_attrs = true,
12831283
},
12841284
.probe = arm_cspmu_device_probe,
1285-
.remove_new = arm_cspmu_device_remove,
1285+
.remove = arm_cspmu_device_remove,
12861286
.id_table = arm_cspmu_id,
12871287
};
12881288

drivers/perf/arm_dmc620_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ static struct platform_driver dmc620_pmu_driver = {
750750
.suppress_bind_attrs = true,
751751
},
752752
.probe = dmc620_pmu_device_probe,
753-
.remove_new = dmc620_pmu_device_remove,
753+
.remove = dmc620_pmu_device_remove,
754754
};
755755

756756
static int __init dmc620_pmu_init(void)

drivers/perf/arm_dsu_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static struct platform_driver dsu_pmu_driver = {
787787
.suppress_bind_attrs = true,
788788
},
789789
.probe = dsu_pmu_device_probe,
790-
.remove_new = dsu_pmu_device_remove,
790+
.remove = dsu_pmu_device_remove,
791791
};
792792

793793
static int dsu_pmu_cpu_online(unsigned int cpu, struct hlist_node *node)

drivers/perf/arm_smmuv3_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ static struct platform_driver smmu_pmu_driver = {
996996
.suppress_bind_attrs = true,
997997
},
998998
.probe = smmu_pmu_probe,
999-
.remove_new = smmu_pmu_remove,
999+
.remove = smmu_pmu_remove,
10001000
.shutdown = smmu_pmu_shutdown,
10011001
};
10021002

drivers/perf/arm_spe_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ static struct platform_driver arm_spe_pmu_driver = {
12801280
.suppress_bind_attrs = true,
12811281
},
12821282
.probe = arm_spe_pmu_device_probe,
1283-
.remove_new = arm_spe_pmu_device_remove,
1283+
.remove = arm_spe_pmu_device_remove,
12841284
};
12851285

12861286
static int __init arm_spe_pmu_init(void)

0 commit comments

Comments
 (0)