diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c index cc349bc1b7c2..c131a5201b5b 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/arch/arm/mach-sa1100/irq.c | |||
@@ -126,7 +126,7 @@ sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc, | |||
126 | mask >>= 11; | 126 | mask >>= 11; |
127 | do { | 127 | do { |
128 | if (mask & 1) | 128 | if (mask & 1) |
129 | desc->handle(irq, desc, regs); | 129 | desc_handle_irq(irq, desc, regs); |
130 | mask >>= 1; | 130 | mask >>= 1; |
131 | irq++; | 131 | irq++; |
132 | desc++; | 132 | desc++; |
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 1405383463ea..fc061641b7be 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c | |||
@@ -61,12 +61,12 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg | |||
61 | 61 | ||
62 | if (irr & IRR_ETHERNET) { | 62 | if (irr & IRR_ETHERNET) { |
63 | d = irq_desc + IRQ_NEPONSET_SMC9196; | 63 | d = irq_desc + IRQ_NEPONSET_SMC9196; |
64 | d->handle(IRQ_NEPONSET_SMC9196, d, regs); | 64 | desc_handle_irq(IRQ_NEPONSET_SMC9196, d, regs); |
65 | } | 65 | } |
66 | 66 | ||
67 | if (irr & IRR_USAR) { | 67 | if (irr & IRR_USAR) { |
68 | d = irq_desc + IRQ_NEPONSET_USAR; | 68 | d = irq_desc + IRQ_NEPONSET_USAR; |
69 | d->handle(IRQ_NEPONSET_USAR, d, regs); | 69 | desc_handle_irq(IRQ_NEPONSET_USAR, d, regs); |
70 | } | 70 | } |
71 | 71 | ||
72 | desc->chip->unmask(irq); | 72 | desc->chip->unmask(irq); |
@@ -74,7 +74,7 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg | |||
74 | 74 | ||
75 | if (irr & IRR_SA1111) { | 75 | if (irr & IRR_SA1111) { |
76 | d = irq_desc + IRQ_NEPONSET_SA1111; | 76 | d = irq_desc + IRQ_NEPONSET_SA1111; |
77 | d->handle(IRQ_NEPONSET_SA1111, d, regs); | 77 | desc_handle_irq(IRQ_NEPONSET_SA1111, d, regs); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | } | 80 | } |