diff options
Diffstat (limited to 'arch/arm/mach-sa1100/neponset.c')
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 4856a6bd2482..6ccd175bc4cf 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c | |||
@@ -33,8 +33,6 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
33 | unsigned int irr; | 33 | unsigned int irr; |
34 | 34 | ||
35 | while (1) { | 35 | while (1) { |
36 | struct irq_desc *d; | ||
37 | |||
38 | /* | 36 | /* |
39 | * Acknowledge the parent IRQ. | 37 | * Acknowledge the parent IRQ. |
40 | */ | 38 | */ |
@@ -67,21 +65,18 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
67 | desc->chip->ack(irq); | 65 | desc->chip->ack(irq); |
68 | 66 | ||
69 | if (irr & IRR_ETHERNET) { | 67 | if (irr & IRR_ETHERNET) { |
70 | d = irq_desc + IRQ_NEPONSET_SMC9196; | 68 | generic_handle_irq(IRQ_NEPONSET_SMC9196); |
71 | desc_handle_irq(IRQ_NEPONSET_SMC9196, d); | ||
72 | } | 69 | } |
73 | 70 | ||
74 | if (irr & IRR_USAR) { | 71 | if (irr & IRR_USAR) { |
75 | d = irq_desc + IRQ_NEPONSET_USAR; | 72 | generic_handle_irq(IRQ_NEPONSET_USAR); |
76 | desc_handle_irq(IRQ_NEPONSET_USAR, d); | ||
77 | } | 73 | } |
78 | 74 | ||
79 | desc->chip->unmask(irq); | 75 | desc->chip->unmask(irq); |
80 | } | 76 | } |
81 | 77 | ||
82 | if (irr & IRR_SA1111) { | 78 | if (irr & IRR_SA1111) { |
83 | d = irq_desc + IRQ_NEPONSET_SA1111; | 79 | generic_handle_irq(IRQ_NEPONSET_SA1111); |
84 | desc_handle_irq(IRQ_NEPONSET_SA1111, d); | ||
85 | } | 80 | } |
86 | } | 81 | } |
87 | } | 82 | } |