From patchwork Fri Jan 29 14:06:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101030 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139630lbb; Fri, 29 Jan 2016 06:08:38 -0800 (PST) X-Received: by 10.98.12.29 with SMTP id u29mr13421715pfi.116.1454076518208; Fri, 29 Jan 2016 06:08:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z5si24515647pfi.34.2016.01.29.06.08.37; Fri, 29 Jan 2016 06:08:38 -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 S932362AbcA2OIb (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:31 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51343 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932240AbcA2OI1 (ORCPT ); Fri, 29 Jan 2016 09:08:27 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lx7w9-1a0i3u2igj-016iss; Fri, 29 Jan 2016 15:07:55 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 6/9] ARM: pxa: move extern declarations to pm.h Date: Fri, 29 Jan 2016 15:06:30 +0100 Message-Id: <1454076396-3563101-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:kFn9IG9Nbr6k4ezrgvazynO16zomLfJUGGYxFySHUR6ygYNVPrl Gi16+OrarUd8OGNcSfCTPDaAKzTO+ZEBUgQVrrva0eK2mUqVUbTqBPu9Sp/36r/QYSY72Ci O8t0wLWRuMX3iX4QkUvqtHiW2q2qX/qtiS218VWMFxGVyIzctTzN/kxjbbZc7ErchX2YgKD yGizpae447NJ3tFtwPYzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ISgZp+Ngz4A=:mbdlSVJaHszmqDnN8deOdk caPLwkOQu8VHGiqmVOwCL4c+jsB90KS+HSXSnqhc9SbBGaksi5I5z5tgNd3BYNfFlAvCYQbJo 6IACeJGUBR+Kk6BthrTS+otSIFK1Rr453nLUk6aBDT28ZjA/XMnrr4FyvFAo+DhHa4jDH86eb lKWQqXiF5/trRR16tV6Pxyp+eG3ELNkUsX65evBslxc3+B95xsN1cXdye231Qi+Pk60PGboyz YOJ+MAupVgr9T2JfqA2rwp7RLNPxC1eisrYhCxBDOiy4QBS2migNP8NA+FI6e8anv4z1HF1r8 jy0DFbkNWfaCwHnA6y2ngM2TDnZplzploMln9aC+NvKaHD00OAjl3w11WZpekacQmtat9pGg5 MEzOEtOcd4p6Xqgi4U2Q/Y9Z/I+fTYLkgdGLQvGhkX0GcVaIi3eL6Nkw+tLEF4RhxjxTF25kY ZdMmYpYpJ97L+nzZBdmZwPZfh/RwDej5ua+CxfpEqZ9xemYGU0z872TPoGgZ7JkMUR0p4P6YC sxw49uFSL8rXdcnejWxnzoMXA3mTJjXjyS4otteYbk02MnYtD9/DdOUN5xFUXaFYdjM4D69pw snc8HI7ky7K+ynMFwVQUboDNZFtcbDKRwSTIpspIOMklIzxVM1S17aQdf4yimy8UtjQgV3epS j9pfzOYyWOepDc1nmfYggppx6d5ptS9d+Z1EG4+9qTIpI1VKdOjX/e/ibaDzn7kFAu2Q= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_IWMMXT is disabled, we get a warning in pxa3xx.c: arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_cpu_pm_suspend': arch/arm/mach-pxa/pxa3xx.c:109:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] It turns out that there is an 'extern' declaration in the middle of a function. For consistency, this moves the declaration and two others from the same file into pm.h. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/pm.h | 3 +++ arch/arm/mach-pxa/pxa3xx.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/pm.h b/arch/arm/mach-pxa/pm.h index 51558bcee999..3aab90d8d2b7 100644 --- a/arch/arm/mach-pxa/pm.h +++ b/arch/arm/mach-pxa/pm.h @@ -29,6 +29,9 @@ extern int pxa_pm_enter(suspend_state_t state); extern int pxa_pm_prepare(void); extern void pxa_pm_finish(void); +extern const char pm_enter_standby_start[], pm_enter_standby_end[]; +extern int pxa3xx_finish_suspend(unsigned long); + /* NOTE: this is for PM debugging on Lubbock, it's really a big * ugly, but let's keep the crap minimum here, instead of direct * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index a1c4c888f246..1ba62be65f7c 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -68,7 +68,6 @@ static unsigned long wakeup_src; */ static void pxa3xx_cpu_standby(unsigned int pwrmode) { - extern const char pm_enter_standby_start[], pm_enter_standby_end[]; void (*fn)(unsigned int) = (void __force *)(sram + 0x8000); memcpy_toio(sram + 0x8000, pm_enter_standby_start, @@ -106,8 +105,6 @@ static void pxa3xx_cpu_pm_suspend(void) asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0)); #endif - extern int pxa3xx_finish_suspend(unsigned long); - /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */ CKENA |= (1 << CKEN_BOOT) | (1 << CKEN_TPM); CKENB |= 1 << (CKEN_HSIO2 & 0x1f);