1 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 680fe386aca5..77b38f2381c1 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -202,13 +202,11 @@ static int __init s3c2416_add_sub(unsigned int base,
 {
         unsigned int irqno;
 
-        set_irq_chip(base, &s3c_irq_level_chip);
-        set_irq_handler(base, handle_level_irq);
-        set_irq_chained_handler(base, demux);
+        irq_set_chip_and_handler(base, &s3c_irq_level_chip, handle_level_irq);
+        irq_set_chained_handler(base, demux);
 
         for (irqno = start; irqno <= end; irqno++) {
-                set_irq_chip(irqno, chip);
-                set_irq_handler(irqno, handle_level_irq);
+                irq_set_chip_and_handler(irqno, chip, handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }