From patchwork Fri Feb 17 00:14:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 141717 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 06D0AB6FBA for ; Fri, 17 Feb 2012 11:17:05 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RyBT7-0004sZ-Vy; Fri, 17 Feb 2012 00:14:34 +0000 Received: from mail-gx0-f177.google.com ([209.85.161.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RyBT1-0004rt-1I for linux-arm-kernel@lists.infradead.org; Fri, 17 Feb 2012 00:14:31 +0000 Received: by ggnf2 with SMTP id f2so1807252ggn.36 for ; Thu, 16 Feb 2012 16:14:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=cSIbkCgQkjYVh/EcS3l5SZeZgeGWgcmTC+BTh5lWD+8=; b=VQ69aU14ZqO19xcSZ5Hr02NbVj7YiLIu8VrQc2iXyKklTtmqqocezMsRqC/saGepBh OTXq59iSjqC0+alWj4dWbddEGXr59uOMGjmTk+exly6PKBvCKs7WatYbWOYMcSV5lL/N qGAfZ+e2n0WaHn82Os2H0ahCSee+InpAJGVOg= Received: by 10.236.154.232 with SMTP id h68mr7010575yhk.51.1329437664033; Thu, 16 Feb 2012 16:14:24 -0800 (PST) Received: from localhost.localdomain ([201.82.161.72]) by mx.google.com with ESMTPS id 34sm12342128anp.13.2012.02.16.16.14.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Feb 2012 16:14:23 -0800 (PST) From: Fabio Estevam To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's Date: Thu, 16 Feb 2012 22:14:11 -0200 Message-Id: <1329437651-8341-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org As we are able to build a single kernel that can run on mx21 and mx25, there is no need for the ifdef's anymore inside audmux-v1.c. Signed-off-by: Fabio Estevam --- arch/arm/plat-mxc/audmux-v1.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c index 1180bef..14a3c04 100644 --- a/arch/arm/plat-mxc/audmux-v1.c +++ b/arch/arm/plat-mxc/audmux-v1.c @@ -46,16 +46,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port); static int mxc_audmux_v1_init(void) { -#ifdef CONFIG_MACH_MX21 if (cpu_is_mx21()) audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR); else -#endif -#ifdef CONFIG_MACH_MX27 + if (cpu_is_mx27()) audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR); else -#endif (void)0; return 0;