Merge branch 'perf/urgent' into perf/core

Merge reason: we'll be queueing up dependent changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c
index eddb52ba5b65..f3355d2ec634 100644
--- a/arch/arm/mach-s3c2412/irq.c
+++ b/arch/arm/mach-s3c2412/irq.c
@@ -175,18 +175,18 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
         unsigned int irqno;
 
         for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) {
-                set_irq_chip(irqno, &s3c2412_irq_eint0t4);
-                set_irq_handler(irqno, handle_edge_irq);
+                irq_set_chip_and_handler(irqno, &s3c2412_irq_eint0t4,
+                                         handle_edge_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
         /* add demux support for CF/SDI */
 
-        set_irq_chained_handler(IRQ_S3C2412_CFSDI, s3c2412_irq_demux_cfsdi);
+        irq_set_chained_handler(IRQ_S3C2412_CFSDI, s3c2412_irq_demux_cfsdi);
 
         for (irqno = IRQ_S3C2412_SDI; irqno <= IRQ_S3C2412_CF; irqno++) {
-                set_irq_chip(irqno, &s3c2412_irq_cfsdi);
-                set_irq_handler(irqno, handle_level_irq);
+                irq_set_chip_and_handler(irqno, &s3c2412_irq_cfsdi,
+                                         handle_level_irq);
                 set_irq_flags(irqno, IRQF_VALID);
         }
 
@@ -195,7 +195,7 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
         s3c2412_irq_rtc_chip = s3c_irq_chip;
         s3c2412_irq_rtc_chip.irq_set_wake = s3c2412_irq_rtc_wake;
 
-        set_irq_chip(IRQ_RTC, &s3c2412_irq_rtc_chip);
+        irq_set_chip(IRQ_RTC, &s3c2412_irq_rtc_chip);
 
         return 0;
 }