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/common/sa1111.c b/arch/arm/common/sa1111.c
index f098f5c9fa3e..a12b33c0dc42 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -472,15 +472,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
         sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);
 
         for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
-                irq_set_chip(irq, &sa1111_low_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1111_low_chip,
+                                         handle_edge_irq);
                 irq_set_chip_data(irq, sachip);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
-                irq_set_chip(irq, &sa1111_high_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1111_high_chip,
+                                         handle_edge_irq);
                 irq_set_chip_data(irq, sachip);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }