diff options
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 191c57a3b997..72280754354d 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -183,7 +183,7 @@ static void __init ap_init_irq(void) | |||
183 | for (i = 0; i < NR_IRQS; i++) { | 183 | for (i = 0; i < NR_IRQS; i++) { |
184 | if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) { | 184 | if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) { |
185 | set_irq_chip(i, &sc_chip); | 185 | set_irq_chip(i, &sc_chip); |
186 | set_irq_handler(i, do_level_IRQ); | 186 | set_irq_handler(i, handle_level_irq); |
187 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 187 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
188 | } | 188 | } |
189 | } | 189 | } |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 771b65bffe69..913f64b22405 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -202,7 +202,7 @@ static struct irq_chip sic_chip = { | |||
202 | }; | 202 | }; |
203 | 203 | ||
204 | static void | 204 | static void |
205 | sic_handle_irq(unsigned int irq, struct irqdesc *desc) | 205 | sic_handle_irq(unsigned int irq, struct irq_desc *desc) |
206 | { | 206 | { |
207 | unsigned long status = sic_readl(INTCP_VA_SIC_BASE + IRQ_STATUS); | 207 | unsigned long status = sic_readl(INTCP_VA_SIC_BASE + IRQ_STATUS); |
208 | 208 | ||
@@ -238,7 +238,7 @@ static void __init intcp_init_irq(void) | |||
238 | if (i == 29) | 238 | if (i == 29) |
239 | break; | 239 | break; |
240 | set_irq_chip(i, &pic_chip); | 240 | set_irq_chip(i, &pic_chip); |
241 | set_irq_handler(i, do_level_IRQ); | 241 | set_irq_handler(i, handle_level_irq); |
242 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 242 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
243 | } | 243 | } |
244 | 244 | ||
@@ -247,7 +247,7 @@ static void __init intcp_init_irq(void) | |||
247 | 247 | ||
248 | for (i = IRQ_CIC_START; i <= IRQ_CIC_END; i++) { | 248 | for (i = IRQ_CIC_START; i <= IRQ_CIC_END; i++) { |
249 | set_irq_chip(i, &cic_chip); | 249 | set_irq_chip(i, &cic_chip); |
250 | set_irq_handler(i, do_level_IRQ); | 250 | set_irq_handler(i, handle_level_irq); |
251 | set_irq_flags(i, IRQF_VALID); | 251 | set_irq_flags(i, IRQF_VALID); |
252 | } | 252 | } |
253 | 253 | ||
@@ -256,7 +256,7 @@ static void __init intcp_init_irq(void) | |||
256 | 256 | ||
257 | for (i = IRQ_SIC_START; i <= IRQ_SIC_END; i++) { | 257 | for (i = IRQ_SIC_START; i <= IRQ_SIC_END; i++) { |
258 | set_irq_chip(i, &sic_chip); | 258 | set_irq_chip(i, &sic_chip); |
259 | set_irq_handler(i, do_level_IRQ); | 259 | set_irq_handler(i, handle_level_irq); |
260 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); | 260 | set_irq_flags(i, IRQF_VALID | IRQF_PROBE); |
261 | } | 261 | } |
262 | 262 | ||