1 files changed, 16 insertions, 24 deletions

diff --git a/arch/sh/boards/mach-microdev/irq.c b/arch/sh/boards/mach-microdev/irq.c
index b551963579c1..c35001fd9032 100644
--- a/arch/sh/boards/mach-microdev/irq.c
+++ b/arch/sh/boards/mach-microdev/irq.c
@@ -65,19 +65,9 @@ static const struct {
 #  error Inconsistancy in defining the IRQ# for primary IDE!
 #endif
 
-static void enable_microdev_irq(unsigned int irq);
-static void disable_microdev_irq(unsigned int irq);
-static void mask_and_ack_microdev(unsigned int);
-
-static struct irq_chip microdev_irq_type = {
-        .name = "MicroDev-IRQ",
-        .unmask = enable_microdev_irq,
-        .mask = disable_microdev_irq,
-        .ack = mask_and_ack_microdev,
-};
-
-static void disable_microdev_irq(unsigned int irq)
+static void disable_microdev_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
         unsigned int fpgaIrq;
 
         if (irq >= NUM_EXTERNAL_IRQS)
@@ -88,11 +78,12 @@ static void disable_microdev_irq(unsigned int irq)
         fpgaIrq = fpgaIrqTable[irq].fpgaIrq;
 
         /* disable interrupts on the FPGA INTC register */
-        ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTDSB_REG);
+        __raw_writel(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTDSB_REG);
 }
 
-static void enable_microdev_irq(unsigned int irq)
+static void enable_microdev_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
         unsigned long priorityReg, priorities, pri;
         unsigned int fpgaIrq;
 
@@ -107,26 +98,27 @@ static void enable_microdev_irq(unsigned int irq)
         priorityReg = MICRODEV_FPGA_INTPRI_REG(fpgaIrq);
 
         /* set priority for the interrupt */
-        priorities = ctrl_inl(priorityReg);
+        priorities = __raw_readl(priorityReg);
         priorities &= ~MICRODEV_FPGA_INTPRI_MASK(fpgaIrq);
         priorities |= MICRODEV_FPGA_INTPRI_LEVEL(fpgaIrq, pri);
-        ctrl_outl(priorities, priorityReg);
+        __raw_writel(priorities, priorityReg);
 
         /* enable interrupts on the FPGA INTC register */
-        ctrl_outl(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTENB_REG);
+        __raw_writel(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTENB_REG);
 }
 
+static struct irq_chip microdev_irq_type = {
+        .name = "MicroDev-IRQ",
+        .irq_unmask = enable_microdev_irq,
+        .irq_mask = disable_microdev_irq,
+};
+
 /* This function sets the desired irq handler to be a MicroDev type */
 static void __init make_microdev_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
         set_irq_chip_and_handler(irq, &microdev_irq_type, handle_level_irq);
-        disable_microdev_irq(irq);
-}
-
-static void mask_and_ack_microdev(unsigned int irq)
-{
-        disable_microdev_irq(irq);
+        disable_microdev_irq(irq_get_irq_data(irq));
 }
 
 extern void __init init_microdev_irq(void)
@@ -134,7 +126,7 @@ extern void __init init_microdev_irq(void)
         int i;
 
         /* disable interrupts on the FPGA INTC register */
-        ctrl_outl(~0ul, MICRODEV_FPGA_INTDSB_REG);
+        __raw_writel(~0ul, MICRODEV_FPGA_INTDSB_REG);
 
         for (i = 0; i < NUM_EXTERNAL_IRQS; i++)
                 make_microdev_irq(i);