On Mon, 01 Mar 2021 06:28:20 PST (-0800), guoren@xxxxxxxxxx wrote:
From: Guo Ren <guoren@xxxxxxxxxxxxxxxxx> Remove RISC-V clocksource custom definitions in hotplug.h: - CPUHP_AP_RISCV_TIMER_STARTING For coding convention. Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Anup Patel <anup.patel@xxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> Tested-by: Guo Ren <guoren@xxxxxxxxxxxxxxxxx> Signed-off-by: Guo Ren <guoren@xxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/lkml/CAHk-=wjM+kCsKqNdb=c0hKsv=J7-3Q1zmM15vp6_=8S5XfGMtA@xxxxxxxxxxxxxx/ --- drivers/clocksource/timer-riscv.c | 4 ++-- include/linux/cpuhotplug.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index c51c5ed..43aee27 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -150,10 +150,10 @@ static int __init riscv_timer_init_dt(struct device_node *n) return error; } - error = cpuhp_setup_state(CPUHP_AP_RISCV_TIMER_STARTING, + error = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "clockevents/riscv/timer:starting", riscv_timer_starting_cpu, riscv_timer_dying_cpu); - if (error) + if (error < 0) pr_err("cpu hp setup state failed for RISCV timer [%d]\n", error); return error; diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 14f49fd..f60538b 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -130,7 +130,6 @@ enum cpuhp_state { CPUHP_AP_MARCO_TIMER_STARTING, CPUHP_AP_MIPS_GIC_TIMER_STARTING, CPUHP_AP_ARC_TIMER_STARTING, - CPUHP_AP_RISCV_TIMER_STARTING, CPUHP_AP_CLINT_TIMER_STARTING, CPUHP_AP_CSKY_TIMER_STARTING, CPUHP_AP_HYPERV_TIMER_STARTING,
Acked-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> Just like the previous one. Presumably CLINT is ours as well? Thanks!
