Skip to contentSkip to conversation

genirq: ARM: Convert lh7a40x to generic irq handling

PATCH In review Ingo Molnar 1 participant 1 message May 17, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 38/50 genirq: ARM: Convert lh7a40x to generic irq handling

From: Thomas Gleixner <[email protected]>

Fixup the conversion to generic irq subsystem.

---
 arch/arm/mach-lh7a40x/arch-lpd7a40x.c |    5 +++--
 arch/arm/mach-lh7a40x/time.c          |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-lh7a40x/arch-lpd7a40x.c +3 -2
Index: linux-genirq.q/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -162,7 +163,7 @@ static void lpd7a40x_cpld_handler (unsig
 {
 	unsigned int mask = CPLD_INTERRUPTS;
 
-	desc->chip->ack (irq);
+	desc->handler->ack (irq);
 
 	if ((mask & 0x1) == 0)	/* WLAN */
 		IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);
@@ -170,7 +171,7 @@ static void lpd7a40x_cpld_handler (unsig
 	if ((mask & 0x2) == 0)	/* Touch */
 		IRQ_DISPATCH (IRQ_LPD7A400_TS);
 
-	desc->chip->unmask (irq); /* Level-triggered need this */
+	desc->handler->unmask (irq); /* Level-triggered need this */
 }
 
 
arch/arm/mach-lh7a40x/time.c +1 -0
Index: linux-genirq.q/arch/arm/mach-lh7a40x/time.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/time.h>
 
 #include <asm/hardware.h>