From patchwork Wed Jun 29 11:46:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 928272 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5TBlNFM003646 for ; Wed, 29 Jun 2011 11:47:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755373Ab1F2LrR (ORCPT ); Wed, 29 Jun 2011 07:47:17 -0400 Received: from na3sys009aog107.obsmtp.com ([74.125.149.197]:49206 "EHLO na3sys009aog107.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755346Ab1F2LrE (ORCPT ); Wed, 29 Jun 2011 07:47:04 -0400 Received: from mail-bw0-f47.google.com ([209.85.214.47]) (using TLSv1) by na3sys009aob107.postini.com ([74.125.148.12]) with SMTP ID DSNKTgsQtxoHHA1aQzQvl/5W73WSfYKowKPg@postini.com; Wed, 29 Jun 2011 04:47:04 PDT Received: by bwf20 with SMTP id 20so1182761bwf.20 for ; Wed, 29 Jun 2011 04:47:02 -0700 (PDT) Received: by 10.204.128.90 with SMTP id j26mr656659bks.116.1309348022129; Wed, 29 Jun 2011 04:47:02 -0700 (PDT) Received: from localhost (cs181221225.pp.htv.fi [82.181.221.225]) by mx.google.com with ESMTPS id k5sm1090999bka.5.2011.06.29.04.47.00 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Jun 2011 04:47:01 -0700 (PDT) From: Felipe Balbi To: Tony Lindgren Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 2/2] cbus: retu: stop polluting Date: Wed, 29 Jun 2011 14:46:51 +0300 Message-Id: <1309348011-23141-3-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1309348011-23141-1-git-send-email-balbi@ti.com> References: <1309348011-23141-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 29 Jun 2011 11:47:24 +0000 (UTC) now that we're using sparse IRQs, we don't need to polute anymore with the dumb IRQ_BASE/IRQ_END definitions. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap1/board-nokia770.c | 2 -- arch/arm/mach-omap2/board-n8x0.c | 2 -- arch/arm/plat-omap/include/plat/irqs.h | 10 +--------- include/linux/platform_data/cbus.h | 2 -- 4 files changed, 1 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7990c48..5eb1a7f 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -124,8 +124,6 @@ static struct resource retu_resource[] = { }; static struct cbus_retu_platform_data nokia770_retu_data = { - .irq_base = CBUS_RETU_IRQ_BASE, - .irq_end = CBUS_RETU_IRQ_END, .devid = CBUS_RETU_DEVICE_ID, }; diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index b3e80c9..f7548e4 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -220,8 +220,6 @@ static struct resource retu_resource[] = { }; static struct cbus_retu_platform_data n8x0_retu_data = { - .irq_base = CBUS_RETU_IRQ_BASE, - .irq_end = CBUS_RETU_IRQ_END, .devid = CBUS_RETU_DEVICE_ID, }; diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 8c8f517..24eeccd 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -419,15 +419,7 @@ #define OMAP_GPMC_NR_IRQS 8 #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS) -#define CBUS_RETU_IRQ_BASE OMAP_GPMC_IRQ_END -#ifdef CONFIG_CBUS_RETU -#define CBUS_RETU_NR_IRQS 16 -#else -#define CBUS_RETU_NR_IRQS 0 -#endif -#define CBUS_RETU_IRQ_END (CBUS_RETU_IRQ_BASE + CBUS_RETU_NR_IRQS) - -#define NR_IRQS CBUS_RETU_IRQ_END +#define NR_IRQS OMAP_GPMC_IRQ_END #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) diff --git a/include/linux/platform_data/cbus.h b/include/linux/platform_data/cbus.h index a1c5a26..09809c7 100644 --- a/include/linux/platform_data/cbus.h +++ b/include/linux/platform_data/cbus.h @@ -32,8 +32,6 @@ struct cbus_host_platform_data { }; struct cbus_retu_platform_data { - int irq_base; - int irq_end; int devid; };