1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 395137a8fad2..58b3bd000834 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -207,8 +207,8 @@ void enable_irq_wake(unsigned int irq)
         unsigned long flags;
 
         spin_lock_irqsave(&irq_controller_lock, flags);
-        if (desc->chip->wake)
-                desc->chip->wake(irq, 1);
+        if (desc->chip->set_wake)
+                desc->chip->set_wake(irq, 1);
         spin_unlock_irqrestore(&irq_controller_lock, flags);
 }
 EXPORT_SYMBOL(enable_irq_wake);
@@ -219,8 +219,8 @@ void disable_irq_wake(unsigned int irq)
         unsigned long flags;
 
         spin_lock_irqsave(&irq_controller_lock, flags);
-        if (desc->chip->wake)
-                desc->chip->wake(irq, 0);
+        if (desc->chip->set_wake)
+                desc->chip->set_wake(irq, 0);
         spin_unlock_irqrestore(&irq_controller_lock, flags);
 }
 EXPORT_SYMBOL(disable_irq_wake);
@@ -624,9 +624,9 @@ int set_irq_type(unsigned int irq, unsigned int type)
         }
 
         desc = irq_desc + irq;
-        if (desc->chip->type) {
+        if (desc->chip->set_type) {
                 spin_lock_irqsave(&irq_controller_lock, flags);
-                ret = desc->chip->type(irq, type);
+                ret = desc->chip->set_type(irq, type);
                 spin_unlock_irqrestore(&irq_controller_lock, flags);
         }
 
@@ -846,8 +846,8 @@ unsigned long probe_irq_on(void)
 
                 irq_desc[i].probing = 1;
                 irq_desc[i].triggered = 0;
-                if (irq_desc[i].chip->type)
-                        irq_desc[i].chip->type(i, IRQT_PROBE);
+                if (irq_desc[i].chip->set_type)
+                        irq_desc[i].chip->set_type(i, IRQT_PROBE);
                 irq_desc[i].chip->unmask(i);
                 irqs += 1;
         }