From patchwork Thu Apr 18 17:54:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 237711 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E0962C01F0 for ; Fri, 19 Apr 2013 03:57:16 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USt3P-0002hx-TN; Thu, 18 Apr 2013 17:55:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1USt2z-0005Eo-IE; Thu, 18 Apr 2013 17:55:01 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USt2b-0005D8-23 for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2013 17:54:37 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=muffinssi.local) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1USt2a-0003iP-Af; Thu, 18 Apr 2013 17:54:36 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+sDXQFMZBc8HmSrnqpedWG Subject: [PATCH 3/3] ARM: OMAP2+: Fix is_gpmc_muxed warning for H4 To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Date: Thu, 18 Apr 2013 10:54:35 -0700 Message-ID: <20130418175435.7436.60372.stgit@muffinssi.local> In-Reply-To: <20130418175303.7436.75241.stgit@muffinssi.local> References: <20130418175303.7436.75241.stgit@muffinssi.local> User-Agent: StGit/0.16-1-ga54b MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130418_135437_197789_E5E628A2 X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.72 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Fix the following error by moving the function to be within the smc91x related ifdef as that's the only user: arch/arm/mach-omap2/board-h4.c:238: warning: ‘is_gpmc_muxed’ defined but not used Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 69c0acf..f745cae 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -229,6 +229,8 @@ static u32 get_sysboot_value(void) OMAP2_SYSBOOT_1_MASK | OMAP2_SYSBOOT_0_MASK)); } +#if IS_ENABLED(CONFIG_SMC91X) + /* H4-2420's always used muxed mode, H4-2422's always use non-muxed * * Note: OMAP-GIT doesn't correctly do is_cpu_omap2422 and is_cpu_omap2423 @@ -246,8 +248,6 @@ static u32 is_gpmc_muxed(void) return 0; } -#if IS_ENABLED(CONFIG_SMC91X) - static struct omap_smc91x_platform_data board_smc91x_data = { .cs = 1, .gpio_irq = 92,