From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,TVD_SPACE_RATIO,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7D93C433E9 for ; Mon, 1 Mar 2021 14:30:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B391064DFB for ; Mon, 1 Mar 2021 14:30:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233264AbhCAOaX (ORCPT ); Mon, 1 Mar 2021 09:30:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:56892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236334AbhCAOaV (ORCPT ); Mon, 1 Mar 2021 09:30:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4874164DA3; Mon, 1 Mar 2021 14:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614608980; bh=OArrRIuC6qn8rHGJqrdoBqnUGJ5tnNzIJ9KKzMe2piE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hu91S+8zTjYMGojrOYDPV5ZNI3asCKh/MSTSyMNzUKh4vy4hwLNcdt49KpGgVh2Ca OBE8dcgLFkgW6xVO2cL5N+IvQB4zUsZNzoATofycfRe4/eMqNi+G2PXv2pKa2Z9T9r 2OU8R6nNttlvksUmWuKwUx0i40u+lcjZQot85JTuYim9QhK+dVMzqK+1/9vvwxNkTJ V1MD+HO+V8BPs85pLyKHxDkncBO40y0yrVq77LdiIObDQuksCfHnI2STLzFYbffNgz 0euFHxT3oOgNlyVX3DjHNAPKoY6TBEUTqf21oYO0CxDSTDUNJ2gwvE9cCu9WnD7s4/ eUhDtb7ND4lFA== From: guoren@kernel.org To: guoren@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, linux-arch@vger.kernel.org, Guo Ren , Peter Zijlstra , Thomas Gleixner , Arnd Bergmann , Linus Torvalds , Anup Patel , Christoph Hellwig , Palmer Dabbelt Subject: [PATCH 2/4] clocksource: riscv: Using CPUHP_AP_ONLINE_DYN Date: Mon, 1 Mar 2021 14:28:20 +0000 Message-Id: <1614608902-85038-2-git-send-email-guoren@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1614608902-85038-1-git-send-email-guoren@kernel.org> References: <1614608902-85038-1-git-send-email-guoren@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-csky@vger.kernel.org From: Guo Ren Remove RISC-V clocksource custom definitions in hotplug.h: - CPUHP_AP_RISCV_TIMER_STARTING For coding convention. Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Arnd Bergmann Cc: Linus Torvalds Cc: Anup Patel Cc: Christoph Hellwig Cc: Palmer Dabbelt Tested-by: Guo Ren Signed-off-by: Guo Ren Link: https://lore.kernel.org/lkml/CAHk-=wjM+kCsKqNdb=c0hKsv=J7-3Q1zmM15vp6_=8S5XfGMtA@mail.gmail.com/ --- 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, -- 2.7.4