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,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 D3340C433DB for ; Mon, 1 Mar 2021 14:31:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A22DB64DF5 for ; Mon, 1 Mar 2021 14:31:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236376AbhCAObb (ORCPT ); Mon, 1 Mar 2021 09:31:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:57406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236359AbhCAOaw (ORCPT ); Mon, 1 Mar 2021 09:30:52 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D90D64DBA; Mon, 1 Mar 2021 14:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614609011; bh=MucoJTNiFHCFYNwN2fx6G+sQ2VpQS44c0zeeuezrTos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rbx8gdTS4v7hg0KO2eaeQK1DKUK2N5PyUae0bKPtj1xcqfwK9GuL3iA5dRfa87Md5 yqhDHWsH0V28RXC65G0kbq5pd2YTh0WydUc44+d8gFB7N+Y0SvVXNK3oiy73qAlNA3 I1wVEcFmeulFH7Ya+U/4kgKkzP0vvDBbQmESCSa2vii3yNwTAvOEJOPxDBjA0KHZFE NLfGwF45GTKehISWdoCSRBJWI0pCPAKXxgMs1xedQcSUKAEv+RvP9qI8YuLeTmoJkJ UE4rElruxCD9TKEF2DkIfI8qDzIzvPZSPk4fFBl8A9kLBpaFJsMczC8rD+kXiLoB+b h9vPdPtctGERA== 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 4/4] perf: csky: Using CPUHP_AP_ONLINE_DYN Date: Mon, 1 Mar 2021 14:28:22 +0000 Message-Id: <1614608902-85038-4-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-kernel@vger.kernel.org From: Guo Ren Remove C-SKY perf custom definitions in hotplug.h: - CPUHP_AP_PERF_CSKY_ONLINE 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/ --- 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