diff mbox series

[3/4] clocksource: csky: Using CPUHP_AP_ONLINE_DYN

Message ID 1614608902-85038-3-git-send-email-guoren@kernel.org (mailing list archive)
State New, archived
Headers show
Series [1/4] irqchip: riscv: Using CPUHP_AP_ONLINE_DYN | expand

Commit Message

Guo Ren March 1, 2021, 2:28 p.m. UTC 
From: Guo Ren <guoren@linux.alibaba.com>

Remove C-SKY clocksource custom definitions in hotplug.h:
 - CPUHP_AP_CSKY_TIMER_STARTING

For coding convention.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Tested-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Link: https://lore.kernel.org/lkml/CAHk-=wjM+kCsKqNdb=c0hKsv=J7-3Q1zmM15vp6_=8S5XfGMtA@mail.gmail.com/
---
 drivers/clocksource/timer-mp-csky.c | 4 ++--
 include/linux/cpuhotplug.h          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/drivers/clocksource/timer-mp-csky.c b/drivers/clocksource/timer-mp-csky.c
index 183a995..fc17d77 100644
--- a/drivers/clocksource/timer-mp-csky.c
+++ b/drivers/clocksource/timer-mp-csky.c
@@ -151,11 +151,11 @@  static int __init csky_mptimer_init(struct device_node *np)
 	clocksource_register_hz(&csky_clocksource, timer_of_rate(to));
 	sched_clock_register(sched_clock_read, 32, timer_of_rate(to));
 
-	ret = cpuhp_setup_state(CPUHP_AP_CSKY_TIMER_STARTING,
+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
 				"clockevents/csky/timer:starting",
 				csky_mptimer_starting_cpu,
 				csky_mptimer_dying_cpu);
-	if (ret)
+	if (ret < 0)
 		return -EINVAL;
 
 	return 0;
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index f60538b..7f25b44 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -131,7 +131,6 @@  enum cpuhp_state {
 	CPUHP_AP_MIPS_GIC_TIMER_STARTING,
 	CPUHP_AP_ARC_TIMER_STARTING,
 	CPUHP_AP_CLINT_TIMER_STARTING,
-	CPUHP_AP_CSKY_TIMER_STARTING,
 	CPUHP_AP_HYPERV_TIMER_STARTING,
 	CPUHP_AP_KVM_STARTING,
 	CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING,