[PATCH 4/4] perf: csky: Using CPUHP_AP_ONLINE_DYN
From: guoren@kernel.org
Date: 2021-03-01 14:31:51
Also in:
linux-riscv, lkml
Subsystem:
c-sky architecture, cpu hotplug, performance events subsystem, the rest · Maintainers:
Guo Ren, Thomas Gleixner, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
From: Guo Ren <redacted> Remove C-SKY perf custom definitions in hotplug.h: - CPUHP_AP_PERF_CSKY_ONLINE For coding convention. Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <redacted> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Tested-by: Guo Ren <redacted> Signed-off-by: Guo Ren <redacted> Link: https://lore.kernel.org/lkml/CAHk-=wjM+kCsKqNdb=c0hKsv=J7-3Q1zmM15vp6_=8S5XfGMtA@mail.gmail.com/ (local) --- arch/csky/kernel/perf_event.c | 4 ++-- include/linux/cpuhotplug.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/csky/kernel/perf_event.c b/arch/csky/kernel/perf_event.c
index e5f1842..ccc27c3 100644
--- a/arch/csky/kernel/perf_event.c
+++ b/arch/csky/kernel/perf_event.c@@ -1319,10 +1319,10 @@ int csky_pmu_device_probe(struct platform_device *pdev, pr_notice("[perf] PMU request irq fail!\n"); } - ret = cpuhp_setup_state(CPUHP_AP_PERF_CSKY_ONLINE, "AP_PERF_ONLINE", + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "arch/csky/perf_event:starting", csky_pmu_starting_cpu, csky_pmu_dying_cpu); - if (ret) { + if (ret < 0) { csky_pmu_free_irq(); free_percpu(csky_pmu.hw_events); return ret;
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 7f25b44..3a76019 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h@@ -182,7 +182,6 @@ enum cpuhp_state { CPUHP_AP_PERF_POWERPC_TRACE_IMC_ONLINE, CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE, CPUHP_AP_PERF_POWERPC_HV_GPCI_ONLINE, - CPUHP_AP_PERF_CSKY_ONLINE, CPUHP_AP_WATCHDOG_ONLINE, CPUHP_AP_WORKQUEUE_ONLINE, CPUHP_AP_RCUTREE_ONLINE,
--
2.7.4