summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/irq.c
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-10-09 13:36:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 15:00:36 +0100
commitd8aa0251f12546e9bd1e9ee1d9782d6492819a04 (patch)
tree7be5c9d598bc727bfcc0f04f679f972c68ca346f /arch/arm/kernel/irq.c
parent27c4cae28148ad97baa2bf8275f7ebc9e2c37c34 (diff)
downloadblackbird-op-linux-d8aa0251f12546e9bd1e9ee1d9782d6492819a04.tar.gz
blackbird-op-linux-d8aa0251f12546e9bd1e9ee1d9782d6492819a04.zip
[ARM] 5298/1: Drop desc_handle_irq()
desc_handle_irq() was declared as obsolete since long ago. Replace it with generic_handle_irq() Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r--arch/arm/kernel/irq.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index f88efb135b70..2f3eb795fa6e 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -112,18 +112,17 @@ static struct irq_desc bad_irq_desc = {
asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);
- struct irq_desc *desc = irq_desc + irq;
+
+ irq_enter();
/*
* Some hardware gives randomly wrong interrupts. Rather
* than crashing, do something sensible.
*/
if (irq >= NR_IRQS)
- desc = &bad_irq_desc;
-
- irq_enter();
-
- desc_handle_irq(irq, desc);
+ handle_bad_irq(irq, &bad_irq_desc);
+ else
+ generic_handle_irq(irq);
/* AT91 specific workaround */
irq_finish(irq);
OpenPOWER on IntegriCloud