[ARM] Change irq_chip wake/type methods to set_wake/set_type

This is part of Thomas Gleixner's generic IRQ patch, which converts
ARM to use the generic IRQ subsystem.  Here, we rename two of the
irq_chip methods - wake becomes set_wake, and type becomes set_type.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

8 files changed, 31 insertions, 31 deletions

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 38c2eb667eb9..1a47fbf9cbbc 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -268,8 +268,8 @@ static struct irqchip sa1111_low_chip = {
         .mask           = sa1111_mask_lowirq,
         .unmask         = sa1111_unmask_lowirq,
         .retrigger      = sa1111_retrigger_lowirq,
-        .type           = sa1111_type_lowirq,
-        .wake           = sa1111_wake_lowirq,
+        .set_type       = sa1111_type_lowirq,
+        .set_wake       = sa1111_wake_lowirq,
 };
 
 static void sa1111_mask_highirq(unsigned int irq)
@@ -364,8 +364,8 @@ static struct irqchip sa1111_high_chip = {
         .mask           = sa1111_mask_highirq,
         .unmask         = sa1111_unmask_highirq,
         .retrigger      = sa1111_retrigger_highirq,
-        .type           = sa1111_type_highirq,
-        .wake           = sa1111_wake_highirq,
+        .set_type       = sa1111_type_highirq,
+        .set_wake       = sa1111_wake_highirq,
 };
 
 static void sa1111_setup_irq(struct sa1111 *sachip)
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;
         }
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 0c2713426dfd..45d22dd5583a 100644
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -214,7 +214,7 @@ static struct irqchip imx_gpio_chip = {
         .ack = imx_gpio_ack_irq,
         .mask = imx_gpio_mask_irq,
         .unmask = imx_gpio_unmask_irq,
-        .type = imx_gpio_irq_type,
+        .set_type = imx_gpio_irq_type,
 };
 
 void __init
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 45b18658499f..594b4c4d5b11 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -380,10 +380,10 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
 }
 
 static struct irqchip ixp2000_GPIO_irq_chip = {
-        .type   = ixp2000_GPIO_irq_type,
-        .ack    = ixp2000_GPIO_irq_mask_ack,
-        .mask   = ixp2000_GPIO_irq_mask,
-        .unmask = ixp2000_GPIO_irq_unmask
+        .ack            = ixp2000_GPIO_irq_mask_ack,
+        .mask           = ixp2000_GPIO_irq_mask,
+        .unmask         = ixp2000_GPIO_irq_unmask
+        .set_type       = ixp2000_GPIO_irq_type,
 };
 
 static void ixp2000_pci_irq_mask(unsigned int irq)
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index f3cac43124a5..6cf35f674464 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -133,7 +133,7 @@ static struct irqchip pxa_low_gpio_chip = {
         .ack            = pxa_ack_low_gpio,
         .mask           = pxa_mask_low_irq,
         .unmask         = pxa_unmask_low_irq,
-        .type           = pxa_gpio_irq_type,
+        .set_type       = pxa_gpio_irq_type,
 };
 
 /*
@@ -241,7 +241,7 @@ static struct irqchip pxa_muxed_gpio_chip = {
         .ack            = pxa_ack_muxed_gpio,
         .mask           = pxa_mask_muxed_gpio,
         .unmask         = pxa_unmask_muxed_gpio,
-        .type           = pxa_gpio_irq_type,
+        .set_type       = pxa_gpio_irq_type,
 };
 
 
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 973a5fe6769c..67138797866a 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -184,14 +184,14 @@ struct irqchip s3c_irq_level_chip = {
         .ack       = s3c_irq_maskack,
         .mask      = s3c_irq_mask,
         .unmask    = s3c_irq_unmask,
-        .wake      = s3c_irq_wake
+        .set_wake          = s3c_irq_wake
 };
 
 static struct irqchip s3c_irq_chip = {
         .ack       = s3c_irq_ack,
         .mask      = s3c_irq_mask,
         .unmask    = s3c_irq_unmask,
-        .wake      = s3c_irq_wake
+        .set_wake          = s3c_irq_wake
 };
 
 /* S3C2410_EINTMASK
@@ -350,16 +350,16 @@ static struct irqchip s3c_irqext_chip = {
         .mask       = s3c_irqext_mask,
         .unmask     = s3c_irqext_unmask,
         .ack        = s3c_irqext_ack,
-        .type       = s3c_irqext_type,
-        .wake       = s3c_irqext_wake
+        .set_type    = s3c_irqext_type,
+        .set_wake    = s3c_irqext_wake
 };
 
 static struct irqchip s3c_irq_eint0t4 = {
         .ack       = s3c_irq_ack,
         .mask      = s3c_irq_mask,
         .unmask    = s3c_irq_unmask,
-        .wake      = s3c_irq_wake,
-        .type      = s3c_irqext_type,
+        .set_wake  = s3c_irq_wake,
+        .set_type  = s3c_irqext_type,
 };
 
 /* mask values for the parent registers for each of the interrupt types */
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index 66a929cb7bc5..cc349bc1b7c2 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -98,8 +98,8 @@ static struct irqchip sa1100_low_gpio_chip = {
         .ack            = sa1100_low_gpio_ack,
         .mask           = sa1100_low_gpio_mask,
         .unmask         = sa1100_low_gpio_unmask,
-        .type           = sa1100_gpio_type,
-        .wake           = sa1100_low_gpio_wake,
+        .set_type       = sa1100_gpio_type,
+        .set_wake       = sa1100_low_gpio_wake,
 };
 
 /*
@@ -181,8 +181,8 @@ static struct irqchip sa1100_high_gpio_chip = {
         .ack            = sa1100_high_gpio_ack,
         .mask           = sa1100_high_gpio_mask,
         .unmask         = sa1100_high_gpio_unmask,
-        .type           = sa1100_gpio_type,
-        .wake           = sa1100_high_gpio_wake,
+        .set_type       = sa1100_gpio_type,
+        .set_wake       = sa1100_high_gpio_wake,
 };
 
 /*
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index a43a353f6c7b..bc9763db1d37 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -42,11 +42,11 @@ struct irqchip {
         /*
          * Set the type of the IRQ.
          */
-        int (*type)(unsigned int, unsigned int);
+        int (*set_type)(unsigned int, unsigned int);
         /*
          * Set wakeup-enable on the selected IRQ
          */
-        int (*wake)(unsigned int, unsigned int);
+        int (*set_wake)(unsigned int, unsigned int);
 
 #ifdef CONFIG_SMP
         /*