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>

2 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c
index f118182a99ca..51d4e44ab973 100644
--- a/arch/arm/mach-h720x/common.c
+++ b/arch/arm/mach-h720x/common.c
@@ -199,15 +199,15 @@ void __init h720x_init_irq (void)
 
         /* Initialize global IRQ's, fast path */
         for (irq = 0; irq < NR_GLBL_IRQS; irq++) {
-                irq_set_chip(irq, &h720x_global_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &h720x_global_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         /* Initialize multiplexed IRQ's, slow path */
         for (irq = IRQ_CHAINED_GPIOA(0) ; irq <= IRQ_CHAINED_GPIOD(31); irq++) {
-                irq_set_chip(irq, &h720x_gpio_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &h720x_gpio_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         irq_set_chained_handler(IRQ_GPIOA, h720x_gpioa_demux_handler);
@@ -217,8 +217,8 @@ void __init h720x_init_irq (void)
 
 #ifdef CONFIG_CPU_H7202
         for (irq = IRQ_CHAINED_GPIOE(0) ; irq <= IRQ_CHAINED_GPIOE(31); irq++) {
-                irq_set_chip(irq, &h720x_gpio_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &h720x_gpio_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         irq_set_chained_handler(IRQ_GPIOE, h720x_gpioe_demux_handler);
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index dd5c72a75dad..c37d570b852d 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -202,8 +202,8 @@ void __init h7202_init_irq (void)
         for (irq = IRQ_TIMER1;
                           irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) {
                 __mask_timerx_irq(irq);
-                irq_set_chip(irq, &h7202_timerx_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &h7202_timerx_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID );
         }
         irq_set_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler);