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>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c
index 5c5ec01d897..c2eceee645e 100644
--- a/arch/arm/mach-clps711x/irq.c
+++ b/arch/arm/mach-clps711x/irq.c
@@ -112,13 +112,13 @@ void __init clps711x_init_irq(void)
 
         for (i = 0; i < NR_IRQS; i++) {
                 if (INT1_IRQS & (1 << i)) {
-                        irq_set_handler(i, handle_level_irq);
-                        irq_set_chip(i, &int1_chip);
+                        irq_set_chip_and_handler(i, &int1_chip,
+                                                 handle_level_irq);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }
                 if (INT2_IRQS & (1 << i)) {
-                        irq_set_handler(i, handle_level_irq);
-                        irq_set_chip(i, &int2_chip);
+                        irq_set_chip_and_handler(i, &int2_chip,
+                                                 handle_level_irq);
                         set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
                 }                       
         }