arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / plat-stmp3xxx / irq.c

diff --git a/arch/arm/plat-stmp3xxx/irq.c b/arch/arm/plat-stmp3xxx/irq.c
index fc2e76488c16988f94d18d2d9b9c42f39793fcee..6fdf9acf82ed50ad70472c1c056106f59a5fa8c2 100644 (file)
--- a/arch/arm/plat-stmp3xxx/irq.c
+++ b/arch/arm/plat-stmp3xxx/irq.c
@@ -35,8 +35,7 @@ void __init stmp3xxx_init_irq(struct irq_chip *chip)
        /* Disable all interrupts initially */
        for (i = 0; i < NR_REAL_IRQS; i++) {
                chip->irq_mask(irq_get_irq_data(i));
-               irq_set_chip(i, chip);
-               irq_set_handler(i, handle_level_irq);
+               irq_set_chip_and_handler(i, chip, handle_level_irq);
                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
        }