diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:14:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:15:08 +0300 |
| commit | 537c2e91d3549e5d6020bb0576cf9b54a845255f (patch) | |
| tree | c09e8a1b7d733cde19b0c72678c28fb2bc97ff6b /drivers/perf/arm_dsu_pmu.c | |
| parent | 237bb5f7f7f55ec5f773469a974c61a49c298625 (diff) | |
| parent | cba9ffdb9913dfe6be29f049ce920ce451ce7cc4 (diff) | |
| download | linux-537c2e91d3549e5d6020bb0576cf9b54a845255f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/perf/arm_dsu_pmu.c')
| -rw-r--r-- | drivers/perf/arm_dsu_pmu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c index 7ec4498e312f..bae3ca37f846 100644 --- a/drivers/perf/arm_dsu_pmu.c +++ b/drivers/perf/arm_dsu_pmu.c @@ -774,14 +774,12 @@ static int dsu_pmu_device_probe(struct platform_device *pdev) return rc; } -static int dsu_pmu_device_remove(struct platform_device *pdev) +static void dsu_pmu_device_remove(struct platform_device *pdev) { struct dsu_pmu *dsu_pmu = platform_get_drvdata(pdev); perf_pmu_unregister(&dsu_pmu->pmu); cpuhp_state_remove_instance(dsu_pmu_cpuhp_state, &dsu_pmu->cpuhp_node); - - return 0; } static const struct of_device_id dsu_pmu_of_match[] = { @@ -806,7 +804,7 @@ static struct platform_driver dsu_pmu_driver = { .suppress_bind_attrs = true, }, .probe = dsu_pmu_device_probe, - .remove = dsu_pmu_device_remove, + .remove_new = dsu_pmu_device_remove, }; static int dsu_pmu_cpu_online(unsigned int cpu, struct hlist_node *node) |