diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:32:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-01 22:32:14 +0100 |
| commit | c4bfa28aec58c588de55babe99f4c172ec534704 (patch) | |
| tree | dc105fc1c44b26e19a82b076b37370812192bd0c /arch/arm/common/sa1111.c | |
| parent | 4a2581a080098ca3a0c4e416d7a282e96c75ebf8 (diff) | |
| download | linux-stable-c4bfa28aec58c588de55babe99f4c172ec534704.tar.gz linux-stable-c4bfa28aec58c588de55babe99f4c172ec534704.tar.bz2 linux-stable-c4bfa28aec58c588de55babe99f4c172ec534704.zip | |
[ARM] 3686/1: ARM: arm/common: convert irq handling
Patch from Thomas Gleixner
From: Thomas Gleixner <tglx@linutronix.de>
Convert the files in arch/arm/common to use the generic
irq handling functions.
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>
Diffstat (limited to 'arch/arm/common/sa1111.c')
| -rw-r--r-- | arch/arm/common/sa1111.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index fe06a36a2130..1cdb26a47e1f 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -150,7 +150,7 @@ static void sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) { unsigned int stat0, stat1, i; - void __iomem *base = desc->data; + void __iomem *base = get_irq_data(irq); stat0 = sa1111_readl(base + SA1111_INTSTATCLR0); stat1 = sa1111_readl(base + SA1111_INTSTATCLR1); @@ -168,11 +168,11 @@ sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) for (i = IRQ_SA1111_START; stat0; i++, stat0 >>= 1) if (stat0 & 1) - do_edge_IRQ(i, irq_desc + i, regs); + handle_edge_irq(i, irq_desc + i, regs); for (i = IRQ_SA1111_START + 32; stat1; i++, stat1 >>= 1) if (stat1 & 1) - do_edge_IRQ(i, irq_desc + i, regs); + handle_edge_irq(i, irq_desc + i, regs); /* For level-based interrupts */ desc->chip->unmask(irq); |