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-s3c2410/bast-irq.c | 10 +++++-----
arch/arm/mach-s3c2410/time.c | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
Index: linux-genirq.q/arch/arm/mach-s3c2410/bast-irq.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-s3c2410/bast-irq.c
+++ linux-genirq.q/arch/arm/mach-s3c2410/bast-irq.c
@@ -95,7 +95,7 @@ bast_pc104_maskack(unsigned int irqno)
struct irqdesc *desc = irq_desc + IRQ_ISA;
bast_pc104_mask(irqno);
- desc->chip->ack(IRQ_ISA);
+ desc->handler->ack(IRQ_ISA);
}
static void
@@ -129,15 +129,15 @@ bast_irq_pc104_demux(unsigned int irq,
/* ack if we get an irq with nothing (ie, startup) */
desc = irq_desc + IRQ_ISA;
- desc->chip->ack(IRQ_ISA);
+ desc->handler->ack(IRQ_ISA);
} else {
/* handle the IRQ */
for (i = 0; stat != 0; i++, stat >>= 1) {
if (stat & 1) {
irqno = bast_pc104_irqs[i];
-
- desc_handle_irq(irqno, irq_desc + irqno, regs);
+ desc = irq_desc + irqno;
+ desc_handle_irq(irqno, desc, regs);
}
}
}
@@ -156,7 +156,7 @@ static __init int bast_irq_init(void)
set_irq_chained_handler(IRQ_ISA, bast_irq_pc104_demux);
- /* reigster our IRQs */
+ /* register our IRQs */
for (i = 0; i < 4; i++) {
unsigned int irqno = bast_pc104_irqs[i];
Index: linux-genirq.q/arch/arm/mach-s3c2410/time.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-s3c2410/time.c
+++ linux-genirq.q/arch/arm/mach-s3c2410/time.c
@@ -23,6 +23,7 @@
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/err.h>
#include <linux/clk.h>
-
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]
