[ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
authorThomas Gleixner <tglx@linutronix.de>
Sat, 1 Jul 2006 21:32:41 +0000 (22:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 1 Jul 2006 21:32:41 +0000 (22:32 +0100)
Patch from Thomas Gleixner

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>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/gpio.c

index 5dac4230360d845daf2c02d2c1a4e6e16c16ffae..2525633fcd09ca47224d098fa8825671007a3ca8 100644 (file)
@@ -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 418b88fbea8e387d170b6e4e6e43e55f9a1dd625..312ace515d170d93ac0ab10c774717ead09b4cae 100644 (file)
@@ -738,7 +738,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
 
        desc->chip->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