From: Thomas Gleixner <[email protected]>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/arm/mach-ixp2000/core.c | 3 ++-
arch/arm/mach-ixp2000/ixdp2x00.c | 6 +++---
arch/arm/mach-ixp2000/ixdp2x01.c | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
Index: linux-genirq.q/arch/arm/mach-ixp2000/core.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-ixp2000/core.c
+++ linux-genirq.q/arch/arm/mach-ixp2000/core.c
@@ -20,6 +20,7 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/serial.h>
#include <linux/tty.h>
#include <linux/bitops.h>
@@ -407,7 +408,7 @@ static void ixp2000_err_irq_handler(unsi
for(i = 31; i >= 0; i--) {
if(status & (1 << i)) {
desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;
- desc->handle(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);
+ desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);
}
}
}
Index: linux-genirq.q/arch/arm/mach-ixp2000/ixdp2x00.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-ixp2000/ixdp2x00.c
+++ linux-genirq.q/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -113,7 +113,7 @@ static void ixdp2x00_irq_handler(unsigne
static struct slowport_cfg old_cfg;
int i;
- desc->chip->mask(irq);
+ desc->handler->mask(irq);
#ifdef CONFIG_ARCH_IXDP2400
if (machine_is_ixdp2400())
@@ -137,7 +137,7 @@ static void ixdp2x00_irq_handler(unsigne
}
}
- desc->chip->unmask(irq);
+ desc->handler->unmask(irq);
}
static struct irqchip ixdp2x00_cpld_irq_chip = {
@@ -168,7 +168,7 @@ void ixdp2x00_init_irq(volatile unsigned
}
/* Hook into PCI interrupt */
- set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x00_irq_handler);
+ set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);
}
/*************************************************************************
Index: linux-genirq.q/arch/arm/mach-ixp2000/ixdp2x01.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-ixp2000/ixdp2x01.c
+++ linux-genirq.q/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -69,7 +69,7 @@ static void ixdp2x01_irq_handler(unsigne
u32 ex_interrupt;
int i;
- desc->chip->mask(irq);
+ desc->handler->mask(irq);
ex_interrupt = *IXDP2X01_INT_STAT_REG & valid_irq_mask;
@@ -87,7 +87,7 @@ static void ixdp2x01_irq_handler(unsigne
}
}
- desc->chip->unmask(irq);
+ desc->handler->unmask(irq);
}
static struct irqchip ixdp2x01_irq_chip = {
@@ -128,7 +128,7 @@ void __init ixdp2x01_init_irq(void)
}
/* Hook into PCI interrupts */
- set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x01_irq_handler);
+ set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
