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=ham 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 6EAFBC433E0 for ; Mon, 1 Mar 2021 14:31:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A89564DA3 for ; Mon, 1 Mar 2021 14:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235872AbhCAOan (ORCPT ); Mon, 1 Mar 2021 09:30:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:57258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232960AbhCAOam (ORCPT ); Mon, 1 Mar 2021 09:30:42 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5331D64DF5; Mon, 1 Mar 2021 14:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614609001; bh=yJODrusALU+6lGK3sTBTBJlwkQywsg5kKkp+JdY5FlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GT4Zb990BBV21L5216of6GW7Ifg/KewOZqZ9YV3HlxJ91EG1P2uadJ68FjQf+nMnD 2GLHjGQMPDubUtQqe2x3Rd0B5zWnys94b5cc2dwQ6cYEGDxSDIV4krPFuwM9ypW8Gr uBisMEypw1sy19olWb4jIqD1bvR9Rd8V5ucmvLnVKBkIrzLrPX0pd8mwaQn3StSjWU YQzjDC50XFYq9j5Qqmb9/xFiwxYS75+nR8df/9OnsSdO1jv6rrGaz8fB1lnkEIR+hI aj1Y+f3pwrcDNzmaS3BRR3r4zhkX3i1quWyPVPrsqXHZBVs/htwPyO+9w5hnPjZmiR G7CUfzABALFjQ== 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 Subject: [PATCH 3/4] clocksource: csky: Using CPUHP_AP_ONLINE_DYN Date: Mon, 1 Mar 2021 14:28:21 +0000 Message-Id: <1614608902-85038-3-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 C-SKY clocksource custom definitions in hotplug.h: - CPUHP_AP_CSKY_TIMER_STARTING For coding convention. Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Arnd Bergmann Cc: Linus Torvalds 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-mp-csky.c | 4 ++-- include/linux/cpuhotplug.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) 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, -- 2.7.4