sh64: irq_data conversion.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 6 insertions, 10 deletions

diff --git a/arch/sh/boards/mach-cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c
index 1394b078db36..d7ac5af9d102 100644
--- a/arch/sh/boards/mach-cayman/irq.c
+++ b/arch/sh/boards/mach-cayman/irq.c
@@ -55,8 +55,9 @@ static struct irqaction cayman_action_pci2 = {
         .flags          = IRQF_DISABLED,
 };
 
-static void enable_cayman_irq(unsigned int irq)
+static void enable_cayman_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
         unsigned long flags;
         unsigned long mask;
         unsigned int reg;
@@ -72,8 +73,9 @@ static void enable_cayman_irq(unsigned int irq)
         local_irq_restore(flags);
 }
 
-void disable_cayman_irq(unsigned int irq)
+static void disable_cayman_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
         unsigned long flags;
         unsigned long mask;
         unsigned int reg;
@@ -89,16 +91,10 @@ void disable_cayman_irq(unsigned int irq)
         local_irq_restore(flags);
 }
 
-static void ack_cayman_irq(unsigned int irq)
-{
-        disable_cayman_irq(irq);
-}
-
 struct irq_chip cayman_irq_type = {
         .name           = "Cayman-IRQ",
-        .unmask         = enable_cayman_irq,
-        .mask           = disable_cayman_irq,
-        .mask_ack       = ack_cayman_irq,
+        .irq_unmask     = enable_cayman_irq,
+        .irq_mask       = disable_cayman_irq,
 };
 
 int cayman_irq_demux(int evt)