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: 122240 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3069591qgn; Mon, 18 Dec 2017 08:53:41 -0800 (PST) X-Google-Smtp-Source: ACJfBosv+GGH/81gH1jdjFH5HAEfw5MUGXsOEA7k6KL6E+boDQdCdoO0wqG/o+q2ZrL/kysP+NaP X-Received: by 10.98.102.74 with SMTP id a71mr334791pfc.184.1513616021412; Mon, 18 Dec 2017 08:53:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513616021; cv=none; d=google.com; s=arc-20160816; b=aqnBrk+SCrW3Z5RDTjCWeYZ34g1w500dSQTt8tXKeVA+AQ5kbtM1xV2XAydY4o3kQj gHHVstRcnIv1ByHkBf+sHZ5oT+2f4RuBgOkjKN/bulWF+UJ5oqc47wcM0VVpXnJ+DpWG cYi5dbBE5Y3pVfiCvwrFofoKVnN7THXRMhMpVVZDeHl/RqA/aHx23NPaUN1OBxbG1tuq uiXAZTADBJuju4lsc64tmn978GRf0xIteZYObR+5uk/4sZ6+gIIFM5wSgHHbFglRr/u8 QRFnLgj7SwSrJ6uqKveW2Ven2FIDdY9xS7g+VvIL1GP960Da7zQhnSFjGGD/A2Z3FDLY kuMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=dUHFsVPOB72b68uOa9QB3ZF9dYJ+rB5D8Ru4s5uOVHE=; b=TGjLm021a/GnoUn8pCWKnaDBq/btRacNcksmmrAnlmj7vd6GCVUvfgmsgUoOJ7i56B A4nW9UgPiJlt0uNcYoSvPRZpM6eASZem9rEqfLt/XZQQdN8eQEZlscs5G1OH05dfRg9z aIfYV83IyrRh5TNrJeKulNpXqXYJksN7s8hGl3kUs2KSpnZNRzt5ymXVY2bXi2zPoscY UcHR8GvMeJ0sq7VYm6+Oy6M/JJhwYaBBgj+30Mk9GZTP0cIjG3t/Rd70NpERb33TdDb5 WKJ0r/lrqWwZCNUhY+UGIBYqB/lHCpy1jTfXR1mXvMfTZcoF8LSaSkRoZJVGAWkQymVo I0pQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z100si9687816plh.172.2017.12.18.08.53.41; Mon, 18 Dec 2017 08:53:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936820AbdLRQxh (ORCPT + 28 others); Mon, 18 Dec 2017 11:53:37 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:56749 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935969AbdLRQxd (ORCPT ); Mon, 18 Dec 2017 11:53:33 -0500 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 Cc: Arnd Bergmann , Alamy Liu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- v2: use fewer #ifdef rather than adding more --- arch/arm/mm/cache-b15-rac.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) -- 2.9.0 Acked-by: Florian Fainelli 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);