arm: Fold irq_set_chip/irq_set_handler

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

diff --git a/arch/arm/mach-msm/irq-vic.c b/arch/arm/mach-msm/irq-vic.c
index 7a805bec32afaa7adad734a4fbc932cf2e783a4a..1b54f807c2d0d573dc87e15bb1ba90102577a580 100644 (file)
--- a/arch/arm/mach-msm/irq-vic.c
+++ b/arch/arm/mach-msm/irq-vic.c
@@ -357,8 +357,7 @@ void __init msm_init_irq(void)
        writel(3, VIC_INT_MASTEREN);
 
        for (n = 0; n < NR_MSM_IRQS; n++) {
-               irq_set_chip(n, &msm_irq_chip);
-               irq_set_handler(n, handle_level_irq);
+               irq_set_chip_and_handler(n, &msm_irq_chip, handle_level_irq);
                set_irq_flags(n, IRQF_VALID);
        }
 }