arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / mach-nuc93x / irq.c

diff --git a/arch/arm/mach-nuc93x/irq.c b/arch/arm/mach-nuc93x/irq.c
index fcf1212d97060484397a7f1be9ec4b59d9ac2168..aa279f23e342af3437b8a5af84f2dcbe5c83fc0b 100644 (file)
--- a/arch/arm/mach-nuc93x/irq.c
+++ b/arch/arm/mach-nuc93x/irq.c
@@ -59,8 +59,8 @@ void __init nuc93x_init_irq(void)
        __raw_writel(0xFFFFFFFE, REG_AIC_MDCR);
 
        for (irqno = IRQ_WDT; irqno <= NR_IRQS; irqno++) {
-               irq_set_chip(irqno, &nuc93x_irq_chip);
-               irq_set_handler(irqno, handle_level_irq);
+               irq_set_chip_and_handler(irqno, &nuc93x_irq_chip,
+                                        handle_level_irq);
                set_irq_flags(irqno, IRQF_VALID);
        }
 }