arm: Fold irq_set_chip/irq_set_handler

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

diff --git a/arch/arm/plat-stmp3xxx/pinmux.c b/arch/arm/plat-stmp3xxx/pinmux.c
index 9057d932799a4f06b59db25d6db2f34e161ff719..3def03b3217d009b51d30c03e88e81c797c24105 100644 (file)
--- a/arch/arm/plat-stmp3xxx/pinmux.c
+++ b/arch/arm/plat-stmp3xxx/pinmux.c
@@ -533,8 +533,8 @@ int __init stmp3xxx_pinmux_init(int virtual_irq_start)
 
                for (virq = pm->virq; virq < pm->virq; virq++) {
                        gpio_irq_chip.irq_mask(irq_get_irq_data(virq));
-                       irq_set_chip(virq, &gpio_irq_chip);
-                       irq_set_handler(virq, handle_level_irq);
+                       irq_set_chip_and_handler(virq, &gpio_irq_chip,
+                                                handle_level_irq);
                        set_irq_flags(virq, IRQF_VALID);
                }
                r = gpiochip_add(&pm->chip);