[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>

1 files changed, 4 insertions, 4 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)