summaryrefslogtreecommitdiff
path: root/arch/sh/boards/mach-microdev/io.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-26 06:58:40 +0300
committerPaul Mundt <lethal@linux-sh.org>2010-01-26 06:58:40 +0300
commit9d56dd3b083a3bec56e9da35ce07baca81030b03 (patch)
treea9df9d514fbc32defc1ca8a6d7c2795f15b8a128 /arch/sh/boards/mach-microdev/io.c
parenta077e91690fb32a1453423b2cf1df3492fd30c3a (diff)
downloadlinux-9d56dd3b083a3bec56e9da35ce07baca81030b03.tar.xz
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>
Diffstat (limited to 'arch/sh/boards/mach-microdev/io.c')
-rw-r--r--arch/sh/boards/mach-microdev/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-microdev/io.c b/arch/sh/boards/mach-microdev/io.c
index 52dd748211c7..2960c659020e 100644
--- a/arch/sh/boards/mach-microdev/io.c
+++ b/arch/sh/boards/mach-microdev/io.c
@@ -141,10 +141,10 @@ static inline void delay(void)
#if defined(CONFIG_PCI)
/* System board present, just make a dummy SRAM access. (CS0 will be
mapped to PCI memory, probably good to avoid it.) */
- ctrl_inw(0xa6800000);
+ __raw_readw(0xa6800000);
#else
/* CS0 will be mapped to flash, ROM etc so safe to access it. */
- ctrl_inw(0xa0000000);
+ __raw_readw(0xa0000000);
#endif
}