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, 10 insertions, 10 deletions

diff --git a/arch/sh/boards/mach-dreamcast/rtc.c b/arch/sh/boards/mach-dreamcast/rtc.c
index a7433685798..061d65714fc 100644
--- a/arch/sh/boards/mach-dreamcast/rtc.c
+++ b/arch/sh/boards/mach-dreamcast/rtc.c
@@ -35,11 +35,11 @@ static void aica_rtc_gettimeofday(struct timespec *ts)
         unsigned long val1, val2;
 
         do {
-                val1 = ((ctrl_inl(AICA_RTC_SECS_H) & 0xffff) << 16) |
-                        (ctrl_inl(AICA_RTC_SECS_L) & 0xffff);
+                val1 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) |
+                        (__raw_readl(AICA_RTC_SECS_L) & 0xffff);
 
-                val2 = ((ctrl_inl(AICA_RTC_SECS_H) & 0xffff) << 16) |
-                        (ctrl_inl(AICA_RTC_SECS_L) & 0xffff);
+                val2 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) |
+                        (__raw_readl(AICA_RTC_SECS_L) & 0xffff);
         } while (val1 != val2);
 
         ts->tv_sec = val1 - TWENTY_YEARS;
@@ -60,14 +60,14 @@ static int aica_rtc_settimeofday(const time_t secs)
         unsigned long adj = secs + TWENTY_YEARS;
 
         do {
-                ctrl_outl((adj & 0xffff0000) >> 16, AICA_RTC_SECS_H);
-                ctrl_outl((adj & 0xffff), AICA_RTC_SECS_L);
+                __raw_writel((adj & 0xffff0000) >> 16, AICA_RTC_SECS_H);
+                __raw_writel((adj & 0xffff), AICA_RTC_SECS_L);
 
-                val1 = ((ctrl_inl(AICA_RTC_SECS_H) & 0xffff) << 16) |
-                        (ctrl_inl(AICA_RTC_SECS_L) & 0xffff);
+                val1 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) |
+                        (__raw_readl(AICA_RTC_SECS_L) & 0xffff);
 
-                val2 = ((ctrl_inl(AICA_RTC_SECS_H) & 0xffff) << 16) |
-                        (ctrl_inl(AICA_RTC_SECS_L) & 0xffff);
+                val2 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) |
+                        (__raw_readl(AICA_RTC_SECS_L) & 0xffff);
         } while (val1 != val2);
 
         return 0;