[patch 45/50] genirq: ARM: Convert plat-omap to generic irq handling

[patch 45/50] genirq: ARM: Convert plat-omap to generic irq handling

[Ingo Molnar]

From: Thomas Gleixner <tglx@linutronix.de>

Fixup the conversion to generic irq subsystem.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/arm/plat-omap/dma.c  |    2 +-
 arch/arm/plat-omap/gpio.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-genirq.q/arch/arm/plat-omap/dma.c
===================================================================
--- linux-genirq.q.orig/arch/arm/plat-omap/dma.c
+++ linux-genirq.q/arch/arm/plat-omap/dma.c
@@ -24,9 +24,9 @@
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/system.h>
-#include <asm/irq.h>
 #include <asm/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
Index: linux-genirq.q/arch/arm/plat-omap/gpio.c
===================================================================
--- linux-genirq.q.orig/arch/arm/plat-omap/gpio.c
+++ linux-genirq.q/arch/arm/plat-omap/gpio.c
@@ -737,9 +737,9 @@ static void gpio_irq_handler(unsigned in
 	unsigned int gpio_irq;
 	struct gpio_bank *bank;
 
-	desc->chip->ack(irq);
+	desc->handler->ack(irq);
 
-	bank = (struct gpio_bank *) desc->data;
+	bank = get_irq_data(irq);
 	if (bank->method == METHOD_MPUIO)
 		isr_reg = bank->base + OMAP_MPUIO_GPIO_INT;
 #ifdef CONFIG_ARCH_OMAP15XX
@@ -783,7 +783,7 @@ static void gpio_irq_handler(unsigned in
 		/* if there is only edge sensitive GPIO pin interrupts
 		configured, we could unmask GPIO bank interrupt immediately */
 		if (!level_mask)
-			desc->chip->unmask(irq);
+			desc->handler->unmask(irq);
 
 		if (!isr)
 			break;
@@ -809,7 +809,7 @@ static void gpio_irq_handler(unsigned in
 		handler(s) are executed in order to avoid spurious bank
 		interrupt */
 		if (level_mask)
-			desc->chip->unmask(irq);
+			desc->handler->unmask(irq);
 	}
 }