arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / mach-pxa / viper.c

diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 26facf1cef650f5f0e9f87c93305cba271ccc280..aa70331c080528c2ae4aaf9b600aa3b2e7cf775e 100644 (file)
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -310,8 +310,8 @@ static void __init viper_init_irq(void)
        /* setup ISA IRQs */
        for (level = 0; level < ARRAY_SIZE(viper_isa_irqs); level++) {
                isa_irq = viper_bit_to_irq(level);
-               irq_set_chip(isa_irq, &viper_irq_chip);
-               irq_set_handler(isa_irq, handle_edge_irq);
+               irq_set_chip_and_handler(isa_irq, &viper_irq_chip,
+                                        handle_edge_irq);
                set_irq_flags(isa_irq, IRQF_VALID | IRQF_PROBE);
        }