arm: Fold irq_set_chip/irq_set_handler

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

diff --git a/arch/arm/mach-msm/gpio.c b/arch/arm/mach-msm/gpio.c
index c9e0c616545c77d94f671528ac7c8d93fd3dd608..5ea273b00da8e4e1fe4273867bf037ecd12cc57f 100644 (file)
--- a/arch/arm/mach-msm/gpio.c
+++ b/arch/arm/mach-msm/gpio.c
@@ -355,8 +355,8 @@ static int __init msm_init_gpio(void)
                        msm_gpio_chips[j].chip.ngpio)
                        j++;
                irq_set_chip_data(i, &msm_gpio_chips[j]);
-               irq_set_chip(i, &msm_gpio_irq_chip);
-               irq_set_handler(i, handle_edge_irq);
+               irq_set_chip_and_handler(i, &msm_gpio_irq_chip,
+                                        handle_edge_irq);
                set_irq_flags(i, IRQF_VALID);
        }