From patchwork Mon Dec 18 13:41:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10119575 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 8CFDB60390 for ; Mon, 18 Dec 2017 13:56:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E8B128997 for ; Mon, 18 Dec 2017 13:56:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 732B228E35; Mon, 18 Dec 2017 13:56:52 +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=ham 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 DC88528997 for ; Mon, 18 Dec 2017 13:56:51 +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=LKYcTAfc+1O1xdA0D0P6UQCM2L3R081dHXq2VJm8fes=; b=pfW fMHQ4MJjsj+AxZUBhlLR43fhOQBV9iuvR2JUyCi/QuisV8el3JnqLNBnPbDcYBV3R1+zhK4c9AOdX pFwnS9PlZUqNgimQst8apkJIxzhvAvKS2DXXX6tOHZ/jjAWq+y0/0UUO2tUHWd6OP7RIUrabhi4kg W4l0+pRj12SdZsQVkBf8XTVsNqagZGn/NMGjNOxA3MTo6KF+JPwkoyRJs/Ih457toQXldG/Nch422 8oeygpubVvWV7Y1AOU1l6gpLzJQ/vSh7VRLkzAiHkOfzrpb26XZjvBNhCK6GkondmuCv0ohJQYhan McJHqcPVeF/7rbPLz1M/VEjbpascqoA==; 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 1eQvuO-0003jX-W2; Mon, 18 Dec 2017 13:56:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eQvuD-00038u-TW for linux-arm-kernel@bombadil.infradead.org; Mon, 18 Dec 2017 13:56:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eeX7cK5wi3f07WdY9FIqxYhfvSZp4z/EBZmDtODA68E=; b=UN1OQhIeefWFN8Rh+4CHZAR1h ksBvnPF34mQ88sitdQ/zCs227cvmVIqcYyzwkx/zBhjcew8tmAIkqaaOg4DVL0IpZMyxIGjjfjEJQ YRSWDQ36tAD0PuvQ1H4D+UpvIPP48XCI+k76CzgiFoEfyp0nqt1QwVaOdVooeAyx7PDguwmto5Jk7 3b5XaF3+mCkigg0hCIr1OltcSNGgPrVnC2yIc3xj7St2gF5RBbXEHB8oHeJcXEb4oDrgB+WIFlVaZ QKFsGvSKulJophmJXmV/Vddm1eYiWOrY/poLltuxjE6+6BkY30M8z1cwsYpPScTn8MDoAbaNcljmC OwNDN0GNQ==; Received: from mout.kundenserver.de ([212.227.126.187]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQvg6-0006bM-WE for linux-arm-kernel@lists.infradead.org; Mon, 18 Dec 2017 13:42:00 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LsdeH-1fAgdq487t-012JNb; Mon, 18 Dec 2017 14:41:28 +0100 From: Arnd Bergmann To: Brian Norris , Gregory Fong , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Russell King Subject: [PATCH] ARM: B15: fix unused label warnings Date: Mon, 18 Dec 2017 14:41:11 +0100 Message-Id: <20171218134126.2913861-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:f4WzuawdkC+W8uu3zGqtnfl+NAaqgiggg37SfrYCdHDlP1ulRgw BRLM9mJcgv/S4/sbjX7QJUBh/ESTQIYSoyYoMjlqSEEeTRSHyTIWDpVOp50luPWk3Jp0YMT KTNdIXbGXNrWZzFvTvNq/iZHyTrg/6cfU5QYGPHcNBusxZfu6Q5rW34KiGRjiWwrUE8SFcZ SLyouEEtVn7GgrKF8HSUQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:XsXBldl6Nyo=:j833WZfuShBnVbkjWfK1WI BorbZngtpqYCkF5zgRNu6JzSi/5pVRayJy122znRnTfRzevRjZIeLO2fMOyoqH30ObVvp/gpS nAJRFNiCj1pQVYTbLNyysBN7Y1VGVb2tjuatEvXXTLIBtZA+20+lhrsCFhIgTeDkGbyB0Wlfd IeSK+vUzbOzVUoXVn0mG5sqUpZ01A6zBbLVA123COHxvUJzoijzxT/4cx2a5mtccCta6IP014 ISmv5F9H2kDyPmCgTk3ff4aAjZGbzVo/rcthQup0oSCQ3nsm1Hey98kaVw7iEk6/LwKoR9tQ6 2SzyTJcTmNdUVn2XJFPnReuiB9nYKXTgXahMbbM0Bz84Ql785Q9ORwX69VfNQAcwKOTlFM1VN tWDCX8ewrlV8RZlSQJuiKwIT72NjzmWRKJWuY1TRkbKOScsEGuQAuUmSWOTvcIPohrY/5MOSB kwHMvRv5E6J2zm359vNpWa83InxzlBWwaMR6QELW4XqLoIsFyMqdBCZPNGHp4QFxZdHH0Kkj1 8EcDkt+BDXAHXjfjTF+S01AizGneiKvVucZyU4H2vJ9aTZO4IMrnVHZ8xso8BFNDNZY+qLj5M BSCeW0i9z3N09GfUVUsNI+j8WMQewEeSCDPr7EAXgN5bkLGHEeiEDhNxgI9QfHk1L+PfIwXjG XGnSlTquR2IlTu0Zfr16WTLhRa9RYh1A0IegdO/1ygAd60PSNQPkeLBBWCEySKWtsIOwLBhi9 dpc6gthjcZZmtwbS/uNxJq21kMsk+mTUDP1B4Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171218_134159_088533_DF074C04 X-CRM114-Status: GOOD ( 11.75 ) 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 adds more #ifdefs around them. Fixes: 55de88778f4b ("ARM: 8726/1: B15: Add CPU hotplug awareness") Signed-off-by: Arnd Bergmann --- Florian, if this looks good to you, please forward the fix into Russell's patch tracker, otherwise just send a better fix. --- arch/arm/mm/cache-b15-rac.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mm/cache-b15-rac.c b/arch/arm/mm/cache-b15-rac.c index f76988790011..24cb3b7a0501 100644 --- a/arch/arm/mm/cache-b15-rac.c +++ b/arch/arm/mm/cache-b15-rac.c @@ -50,7 +50,10 @@ extern void v7_flush_kern_cache_all(void); static void __iomem *b15_rac_base; static DEFINE_SPINLOCK(rac_lock); + +#if IS_ENABLED(CONFIG_HOTPLUG_CPU) || IS_ENABLED(CONFIG_PM_SLEEP) static u32 rac_config0_reg; +#endif /* Initialization flag to avoid checking for b15_rac_base, and to prevent * multi-platform kernels from crashing here as well. @@ -348,11 +351,13 @@ static int __init b15_rac_init(void) goto out; +#ifdef CONFIG_HOTPLUG_CPU out_cpu_dead: cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DYING); out_unmap: unregister_reboot_notifier(&b15_rac_reboot_nb); iounmap(b15_rac_base); +#endif out: of_node_put(dn); return ret;