From patchwork Tue Feb 12 03:47:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2126831 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 89739DFB7B for ; Tue, 12 Feb 2013 03:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753192Ab3BLDr1 (ORCPT ); Mon, 11 Feb 2013 22:47:27 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:44278 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817Ab3BLDr0 (ORCPT ); Mon, 11 Feb 2013 22:47:26 -0500 Received: by mail-pa0-f41.google.com with SMTP id fb11so3449789pad.28 for ; Mon, 11 Feb 2013 19:47:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=pDh3JOD8t1aiI48s8NG3YZW/Vq+2419r1Bmg43Icy/Y=; b=UtPxvqtnkYMLgIj29nsgL26iwZNDPvLXx+Oi8Nu8Ygmkx1ZVk3k9HKNL4/jqf3NSY9 jlZIWOMP1aZ1m+d3581n27+mHe4jxNa5enQVVyrDEGoqHmxDOhpd9prHuJqFwRwaaRC1 zzxqg7/LprFayly+iEUORo3VWVcavDD2R4K4/ej1C2YFo1IkaojtVhNm8qkcvzX0OAe+ yLi8iMcPDoH305m2VfIg3nEHN9rOZcppjFXb0w7UTP5PrB9qNCDbjLpXT/KEvFthpUWm Wphk+mSZu/TnFri+0XmoxpqZT6P1m/JR7yKVaGywqf+3TaocPrzxMi2wcuY2j9ZXuyZ1 x8Zg== X-Received: by 10.66.82.67 with SMTP id g3mr47285434pay.58.1360640845277; Mon, 11 Feb 2013 19:47:25 -0800 (PST) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id t6sm71373279paz.11.2013.02.11.19.47.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Feb 2013 19:47:23 -0800 (PST) From: Olof Johansson To: tony@atomide.com Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Olof Johansson Subject: [PATCH] ARM: omap: board-h4: remove warning for is_gpmc_muxed Date: Mon, 11 Feb 2013 19:47:16 -0800 Message-Id: <1360640836-18792-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 X-Gm-Message-State: ALoCoQmk80x/aN41QazLUhqDId340tw3BPzEg9akVUFLRfLOCfnN7IujfFukIWbhqcH0NHUCQcER Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org If the ethernet driver is not selected, you otherwise get: arch/arm/mach-omap2/board-h4.c:237:12: warning: 'is_gpmc_muxed' defined but not used [-Wunused-function] I guess it could be argued that the device setup should/could always be done even if the driver isn't enabled, but hopefully the board files will all go away some day so let's stick to the smaller delta. Signed-off-by: Olof Johansson Acked-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 812c829..e34541d 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 defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE) + /* 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 defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE) - static struct omap_smc91x_platform_data board_smc91x_data = { .cs = 1, .gpio_irq = 92,