From mboxrd@z Thu Jan 1 00:00:00 1970 From: Viresh Kumar Subject: Re: [PATCH 15/31] ARM: amba: spear: get rid of NO_IRQ initializers Date: Fri, 20 Jan 2012 15:00:56 +0530 Message-ID: <4F193450.4010607@st.com> References: <20120120092207.GD1068@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-samsung-soc-owner@vger.kernel.org To: Russell King - ARM Linux Cc: "linux-arm-kernel@lists.infradead.org" , "devicetree-discuss@lists.ozlabs.org" , "linux-mmc@vger.kernel.org" , "linux-omap@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , STEricsson_nomadik_linux , Rajeev KUMAR , Shiraz HASHIM List-Id: devicetree@vger.kernel.org On 1/20/2012 2:57 PM, Russell King - ARM Linux wrote: > Signed-off-by: Russell King > --- > arch/arm/mach-spear3xx/spear300.c | 2 +- > arch/arm/mach-spear3xx/spear3xx.c | 4 ++-- > arch/arm/mach-spear6xx/spear6xx.c | 10 +++++----- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c > index a5e46b4..6fdeec9 100644 > --- a/arch/arm/mach-spear3xx/spear300.c > +++ b/arch/arm/mach-spear3xx/spear300.c > @@ -440,7 +440,7 @@ struct amba_device spear300_gpio1_device = { > .end = SPEAR300_GPIO_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {SPEAR300_VIRQ_GPIO1, NO_IRQ}, > + .irq = {SPEAR300_VIRQ_GPIO1}, > }; > > /* spear300 routines */ > diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c > index 10af45d..bc4f1c6 100644 > --- a/arch/arm/mach-spear3xx/spear3xx.c > +++ b/arch/arm/mach-spear3xx/spear3xx.c > @@ -38,7 +38,7 @@ struct amba_device spear3xx_gpio_device = { > .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {SPEAR3XX_IRQ_BASIC_GPIO, NO_IRQ}, > + .irq = {SPEAR3XX_IRQ_BASIC_GPIO}, > }; > > /* uart device registration */ > @@ -51,7 +51,7 @@ struct amba_device spear3xx_uart_device = { > .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {SPEAR3XX_IRQ_UART, NO_IRQ}, > + .irq = {SPEAR3XX_IRQ_UART}, > }; > > /* Do spear3xx familiy common initialization part here */ > diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c > index e0f6628..b997b1b 100644 > --- a/arch/arm/mach-spear6xx/spear6xx.c > +++ b/arch/arm/mach-spear6xx/spear6xx.c > @@ -34,7 +34,7 @@ struct amba_device uart_device[] = { > .end = SPEAR6XX_ICM1_UART0_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {IRQ_UART_0, NO_IRQ}, > + .irq = {IRQ_UART_0}, > }, { > .dev = { > .init_name = "uart1", > @@ -44,7 +44,7 @@ struct amba_device uart_device[] = { > .end = SPEAR6XX_ICM1_UART1_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {IRQ_UART_1, NO_IRQ}, > + .irq = {IRQ_UART_1}, > } > }; > > @@ -73,7 +73,7 @@ struct amba_device gpio_device[] = { > .end = SPEAR6XX_CPU_GPIO_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {IRQ_LOCAL_GPIO, NO_IRQ}, > + .irq = {IRQ_LOCAL_GPIO}, > }, { > .dev = { > .init_name = "gpio1", > @@ -84,7 +84,7 @@ struct amba_device gpio_device[] = { > .end = SPEAR6XX_ICM3_GPIO_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {IRQ_BASIC_GPIO, NO_IRQ}, > + .irq = {IRQ_BASIC_GPIO}, > }, { > .dev = { > .init_name = "gpio2", > @@ -95,7 +95,7 @@ struct amba_device gpio_device[] = { > .end = SPEAR6XX_ICM2_GPIO_BASE + SZ_4K - 1, > .flags = IORESOURCE_MEM, > }, > - .irq = {IRQ_APPL_GPIO, NO_IRQ}, > + .irq = {IRQ_APPL_GPIO}, > } > }; > Acked-by: Viresh Kumar -- viresh