sh: Mass ctrl_in/outX to __raw_read/writeX conversion.

The old ctrl in/out routines are non-portable and unsuitable for
cross-platform use. While drivers/sh has already been sanitized, there
is still quite a lot of code that is not. This converts the arch/sh/ bits
over, which permits us to flag the routines as deprecated whilst still
building with -Werror for the architecture code, and to ensure that
future users are not added.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c
index 986a0e71d220..523aea5dc94e 100644
--- a/arch/sh/boards/mach-systemh/irq.c
+++ b/arch/sh/boards/mach-systemh/irq.c
@@ -41,13 +41,13 @@ static void disable_systemh_irq(unsigned int irq)
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Clear the "irq"th bit in the mask and set it in the request */
-                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val = __raw_readl((unsigned long)systemh_irq_mask_register);
                 val &= ~mask;
-                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+                __raw_writel(val, (unsigned long)systemh_irq_mask_register);
 
-                val = ctrl_inl((unsigned long)systemh_irq_request_register);
+                val = __raw_readl((unsigned long)systemh_irq_request_register);
                 val |= mask;
-                ctrl_outl(val, (unsigned long)systemh_irq_request_register);
+                __raw_writel(val, (unsigned long)systemh_irq_request_register);
         }
 }
 
@@ -57,9 +57,9 @@ static void enable_systemh_irq(unsigned int irq)
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Set "irq"th bit in the mask register */
-                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val = __raw_readl((unsigned long)systemh_irq_mask_register);
                 val |= mask;
-                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+                __raw_writel(val, (unsigned long)systemh_irq_mask_register);
         }
 }