Skip to contentSkip to conversation

genirq: ARM: Convert omap1 to generic irq handling

PATCH In review Ingo Molnar 2 participants 3 messages May 17, 2006

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

PATCH 39/50 genirq: ARM: Convert omap1 to generic irq handling

From: Thomas Gleixner <[email protected]>

Fixup the conversion to generic irq subsystem.

---
 arch/arm/mach-omap1/board-osk.c |    2 +-
 arch/arm/mach-omap1/serial.c    |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap1/board-osk.c +1 -1
Index: linux-genirq.q/arch/arm/mach-omap1/board-osk.c
===================================================================
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
arch/arm/mach-omap1/serial.c +1 -0
Index: linux-genirq.q/arch/arm/mach-omap1/serial.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
#1 lore raw

The set_wake member in irq_chip structure must have changed ..

In -v3 it's

int (*set_wake)(unsigned int irq, int on);

and in arch/arm/mach-omap1/irq.c that member gets set to

static int omap_wake_irq(unsigned int irq, unsigned int enable)

this is from 2.6.17-rc4 so it's likely in some level of flux either in the generic irq patch or the omap tree ..

Daniel

#2 lore raw
Quoted 4 lines · Daniel Walker

The set_wake member in irq_chip structure must have changed ..

In -v3 it's

Quoted 8 lines

int (*set_wake)(unsigned int irq, int on);

and in arch/arm/mach-omap1/irq.c that member gets set to

static int omap_wake_irq(unsigned int irq, unsigned int enable)

this is from 2.6.17-rc4 so it's likely in some level of flux either in the generic irq patch or the omap tree ..

indeed - it's flux from -v4 cleanups. I have changed it back to 'unsigned int on'.

Ingo