arm: Fold irq_set_chip/irq_set_handler

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-ebsa110 / core.c

diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index caf6cbac33e0866abcf077d29ec83bcd4e35deb6..087bc771ac23dfb770baf717e8487dbece2b5cce 100644 (file)
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -66,8 +66,8 @@ static void __init ebsa110_init_irq(void)
        local_irq_restore(flags);
 
        for (irq = 0; irq < NR_IRQS; irq++) {
-               irq_set_chip(irq, &ebsa110_irq_chip);
-               irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_and_handler(irq, &ebsa110_irq_chip,
+                                        handle_level_irq);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 }