arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / mach-s3c2410 / bast-irq.c

diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 4139f5f0b418e18dbdf68c3d7b3c06fca52a97d9..bc53d2d16d1a3917ef05a9f703028b0509ed64ee 100644 (file)
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -154,8 +154,8 @@ static __init int bast_irq_init(void)
                for (i = 0; i < 4; i++) {
                        unsigned int irqno = bast_pc104_irqs[i];
 
-                       irq_set_chip(irqno, &bast_pc104_chip);
-                       irq_set_handler(irqno, handle_level_irq);
+                       irq_set_chip_and_handler(irqno, &bast_pc104_chip,
+                                                handle_level_irq);
                        set_irq_flags(irqno, IRQF_VALID);
                }
        }