arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / plat-mxc / avic.c

diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index 8b30c83a2ab18fbfc1840958389e4846c242864c..09e2bd0fcdca742a41b004d3c846fa16b298a309 100644 (file)
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/plat-mxc/avic.c
@@ -139,8 +139,8 @@ void __init mxc_init_irq(void __iomem *irqbase)
        __raw_writel(0, avic_base + AVIC_INTTYPEH);
        __raw_writel(0, avic_base + AVIC_INTTYPEL);
        for (i = 0; i < MXC_INTERNAL_IRQS; i++) {
-               irq_set_chip(i, &mxc_avic_chip.base);
-               irq_set_handler(i, handle_level_irq);
+               irq_set_chip_and_handler(i, &mxc_avic_chip.base,
+                                        handle_level_irq);
                set_irq_flags(i, IRQF_VALID);
        }