arm: Fold irq_set_chip/irq_set_handler

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

diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c
index 4148048c4191041d6de9afef34377de31ff0d4ce..76a3f654220f2f012b842b9e2794811fba2a4710 100644 (file)
--- a/arch/arm/mach-tegra/gpio.c
+++ b/arch/arm/mach-tegra/gpio.c
@@ -342,8 +342,8 @@ static int __init tegra_gpio_init(void)
 
                irq_set_lockdep_class(i, &gpio_lock_class);
                irq_set_chip_data(i, bank);
-               irq_set_chip(i, &tegra_gpio_irq_chip);
-               irq_set_handler(i, handle_simple_irq);
+               irq_set_chip_and_handler(i, &tegra_gpio_irq_chip,
+                                        handle_simple_irq);
                set_irq_flags(i, IRQF_VALID);
        }