From patchwork Mon Dec 18 16:52:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10120825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6600460390 for ; Mon, 18 Dec 2017 16:53:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 568F728CFE for ; Mon, 18 Dec 2017 16:53:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A57828D14; Mon, 18 Dec 2017 16:53:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F335F28CFE for ; Mon, 18 Dec 2017 16:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=uR2lytE/kPEITQi33hhZabn8/BWUWMkb2ne0eWYWyPQ=; b=OYy pU3p1jB2g0LfBWni3RC6DXGiK66yeoimtf1qKso4esjj1pHJL3WtfiALLD/ttqc8S732Yq78ZnFOI g0E59GZ2NkJH3rnXOV80YTg9ZPRvdn2YSm9meKBreHV7xHlSPx445TNvC47G0uLMIAVSK/P2yV3zY nNjIF1Ks4LYm6qQA4qRdRksz+n0oAtbG8Sc4SMxfo6SYOkoZZs0PyyS/tlyqtc0s277DceI05xZyP H7j8c20wVz/jd245hos5oO9vCIX+d3vwHSHiNwMUos+DP800/Ci2ZRNJed1avRzrD05X0V2E5quqO 9Q0aJjnFLMekP2lfDTrsJz2HZwh5uFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eQyff-0005Ys-Tf; Mon, 18 Dec 2017 16:53:43 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eQyfN-0005MS-A5 for linux-arm-kernel@lists.infradead.org; Mon, 18 Dec 2017 16:53:31 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LfBRg-1eozng0PQ8-00omoO; Mon, 18 Dec 2017 17:53:08 +0100 From: Arnd Bergmann To: Brian Norris , Gregory Fong , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Russell King Subject: [PATCH] [v2] ARM: B15: fix unused label warnings Date: Mon, 18 Dec 2017 17:52:58 +0100 Message-Id: <20171218165307.1472231-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:cAxalopfxtMwY8jFN+GhYNkDnNrirpkURHTKueL6jYdM+XhugH+ 4FNw50VZOV97r0+gLubyb/ah72njtyUNo6pRWQoZPzHF6bkpvfikhTHlbxAell3HYuPB2H3 +29jk5C4/LHMIEessytYYoOsJY4am3ORTpYCjq08VDuxUe0k77/EDk6yzuyJduhtbyivw5i i0PEhL2InP2vR+iuUJGSA== X-UI-Out-Filterresults: notjunk:1; V01:K0:zwRnPQp39P8=:8CDN/sR+EpbE25Fi2XgGmF z+GsyBxRIwEsqSud2B9WLVmLGL00zCyzaUDswGf5PhLk9Iyjy673YEBAxNlM8eXVqOyhyhFkP pu940Jjz+Tn85/BgjAYjHW4yCO5uMLEaFuswWuwZNebCAGm/zxkYdpu4riqyi+SL6nFSsHMSE qtBNM/8iWXe7qEsBAIi4PfPtrVTIvs3cTz8hDUEKTyIfHii8sHjsz2hYbr6VGimul5tp4xGGC 8g5sh8OPBcoClYAzyH9buugwhaJVvwP12wM79T4eT5MQFkvVuBgIp9dXqcOLRWp4BWOpVzECZ 0y3ewoCUV11AO+RQYyFazFT+ATHMVkFIMgxBtle5GE5gsdek2RmMZv697zjnIyWt1ogRybJOx C2CacNn6vrMM7b/2AxqjPHpzIbWw+ZNdlq4iL6AwStuCQ7d4G47ozbFd13+UgDiT3oCPsNVjf Po/seHnt0DT10fRnrQnE94ZzqEmE/2/2tuYjXJ5zQOUupq7zADaIvo+sz5rgTDq2gbNM/dw0A rm34anRabgfMlEJ4j4ysFie7TCsGZHfc8Uu2q07kZ36TAsvFJPuJM2DsPu7bzh7K1x2RGiTHH TkgDFu6ZzfSXy5gb8kq+6gZIBAu00+j+QX7CCM097A1K2bP4VQsY9TMzHwNeXt+e89XY9t1Rf Fbv9hrqEyyVNDAhtV2kg+AjmFwSTZRR/iu+zCeiXXKdgGJGPitJPvtOuEtN5gxwxzamqbi8a1 fhHaCtxnB1mdhU1yqkW34UXF/jwDgYEuv2qRjQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171218_085325_988435_9F929929 X-CRM114-Status: GOOD ( 13.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Alamy Liu MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The new conditionally compiled code leaves some labels and one variable unreferenced when CONFIG_HOTPLUG_CPU and CONFIG_PM_SLEEP are disabled: arch/arm/mm/cache-b15-rac.c: In function 'b15_rac_init': arch/arm/mm/cache-b15-rac.c:353:1: error: label 'out_unmap' defined but not used [-Werror=unused-label] out_unmap: ^~~~~~~~~ arch/arm/mm/cache-b15-rac.c:351:1: error: label 'out_cpu_dead' defined but not used [-Werror=unused-label] out_cpu_dead: ^~~~~~~~~~~~ At top level: arch/arm/mm/cache-b15-rac.c:53:12: error: 'rac_config0_reg' defined but not used [-Werror=unused-variable] This replaces the existing #ifdef conditionals with IS_ENABLED() checks that let the compiler figure out for itself which code to drop. Fixes: 55de88778f4b ("ARM: 8726/1: B15: Add CPU hotplug awareness") Signed-off-by: Arnd Bergmann Acked-by: Florian Fainelli --- v2: use fewer #ifdef rather than adding more --- arch/arm/mm/cache-b15-rac.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/arch/arm/mm/cache-b15-rac.c b/arch/arm/mm/cache-b15-rac.c index f76988790011..d9586ba2e63c 100644 --- a/arch/arm/mm/cache-b15-rac.c +++ b/arch/arm/mm/cache-b15-rac.c @@ -50,6 +50,7 @@ extern void v7_flush_kern_cache_all(void); static void __iomem *b15_rac_base; static DEFINE_SPINLOCK(rac_lock); + static u32 rac_config0_reg; /* Initialization flag to avoid checking for b15_rac_base, and to prevent @@ -175,7 +176,6 @@ static struct notifier_block b15_rac_reboot_nb = { .notifier_call = b15_rac_reboot_notifier, }; -#ifdef CONFIG_HOTPLUG_CPU /* The CPU hotplug case is the most interesting one, we basically need to make * sure that the RAC is disabled for the entire system prior to having a CPU * die, in particular prior to this dying CPU having exited the coherency @@ -253,9 +253,7 @@ static int b15_rac_dead_cpu(unsigned int cpu) return 0; } -#endif /* CONFIG_HOTPLUG_CPU */ -#ifdef CONFIG_PM_SLEEP static int b15_rac_suspend(void) { /* Suspend the read-ahead cache oeprations, forcing our cache @@ -286,7 +284,6 @@ static struct syscore_ops b15_rac_syscore_ops = { .suspend = b15_rac_suspend, .resume = b15_rac_resume, }; -#endif static int __init b15_rac_init(void) { @@ -315,23 +312,22 @@ static int __init b15_rac_init(void) goto out; } -#ifdef CONFIG_HOTPLUG_CPU - ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DEAD, + if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) { + ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DEAD, "arm/cache-b15-rac:dead", NULL, b15_rac_dead_cpu); - if (ret) - goto out_unmap; + if (ret) + goto out_unmap; - ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DYING, + ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DYING, "arm/cache-b15-rac:dying", NULL, b15_rac_dying_cpu); - if (ret) - goto out_cpu_dead; -#endif + if (ret) + goto out_cpu_dead; + } -#ifdef CONFIG_PM_SLEEP - register_syscore_ops(&b15_rac_syscore_ops); -#endif + if (IS_ENABLED(CONFIG_PM_SLEEP)) + register_syscore_ops(&b15_rac_syscore_ops); spin_lock(&rac_lock); reg = __raw_readl(b15_rac_base + RAC_CONFIG0_REG);