summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop33x/irq.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-24 13:35:09 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 14:47:58 +0200
commitf38c02f3b338651e145aac2889ba976baf6b28b3 (patch)
tree30cfbf42ccff4a9dc26d95e9058ec76f5fde78bb /arch/arm/mach-iop33x/irq.c
parentarm: Reorder irq_set_ function calls (diff)
downloadlinux-f38c02f3b338651e145aac2889ba976baf6b28b3.tar.xz
linux-f38c02f3b338651e145aac2889ba976baf6b28b3.zip
arm: Fold irq_set_chip/irq_set_handler
Use irq_set_chip_and_handler() instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-iop33x/irq.c')
-rw-r--r--arch/arm/mach-iop33x/irq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
index 7b205e990298..f7f5d3e451c7 100644
--- a/arch/arm/mach-iop33x/irq.c
+++ b/arch/arm/mach-iop33x/irq.c
@@ -110,9 +110,9 @@ void __init iop33x_init_irq(void)
*IOP3XX_PCIIRSR = 0x0f;
for (i = 0; i < NR_IRQS; i++) {
- irq_set_chip(i,
- (i < 32) ? &iop33x_irqchip1 : &iop33x_irqchip2);
- irq_set_handler(i, handle_level_irq);
+ irq_set_chip_and_handler(i,
+ (i < 32) ? &iop33x_irqchip1 : &iop33x_irqchip2,
+ handle_level_irq);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}