arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / mach-mxs / gpio.c

diff --git a/arch/arm/mach-mxs/gpio.c b/arch/arm/mach-mxs/gpio.c
index a1e01dd4a4ff6d41818d7c60b80584562d39250e..2c950fef71a87ef9d39f7f79ec2831cf94ba1e7f 100644 (file)
--- a/arch/arm/mach-mxs/gpio.c
+++ b/arch/arm/mach-mxs/gpio.c
@@ -265,8 +265,8 @@ int __init mxs_gpio_init(struct mxs_gpio_port *port, int cnt)
 
                for (j = port[i].virtual_irq_start;
                        j < port[i].virtual_irq_start + 32; j++) {
-                       irq_set_chip(j, &gpio_irq_chip);
-                       irq_set_handler(j, handle_level_irq);
+                       irq_set_chip_and_handler(j, &gpio_irq_chip,
+                                                handle_level_irq);
                        set_irq_flags(j, IRQF_VALID);
                }