diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-25 22:58:40 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-25 22:58:40 -0500 |
commit | 9d56dd3b083a3bec56e9da35ce07baca81030b03 (patch) | |
tree | a9df9d514fbc32defc1ca8a6d7c2795f15b8a128 /arch/sh/include/cpu-sh3 | |
parent | a077e91690fb32a1453423b2cf1df3492fd30c3a (diff) |
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/include/cpu-sh3')
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/dac.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/include/cpu-sh3/cpu/dac.h b/arch/sh/include/cpu-sh3/cpu/dac.h index 05fda8316ebc..98f1d15f0ab5 100644 --- a/arch/sh/include/cpu-sh3/cpu/dac.h +++ b/arch/sh/include/cpu-sh3/cpu/dac.h | |||
@@ -17,25 +17,25 @@ | |||
17 | static __inline__ void sh_dac_enable(int channel) | 17 | static __inline__ void sh_dac_enable(int channel) |
18 | { | 18 | { |
19 | unsigned char v; | 19 | unsigned char v; |
20 | v = ctrl_inb(DACR); | 20 | v = __raw_readb(DACR); |
21 | if(channel) v |= DACR_DAOE1; | 21 | if(channel) v |= DACR_DAOE1; |
22 | else v |= DACR_DAOE0; | 22 | else v |= DACR_DAOE0; |
23 | ctrl_outb(v,DACR); | 23 | __raw_writeb(v,DACR); |
24 | } | 24 | } |
25 | 25 | ||
26 | static __inline__ void sh_dac_disable(int channel) | 26 | static __inline__ void sh_dac_disable(int channel) |
27 | { | 27 | { |
28 | unsigned char v; | 28 | unsigned char v; |
29 | v = ctrl_inb(DACR); | 29 | v = __raw_readb(DACR); |
30 | if(channel) v &= ~DACR_DAOE1; | 30 | if(channel) v &= ~DACR_DAOE1; |
31 | else v &= ~DACR_DAOE0; | 31 | else v &= ~DACR_DAOE0; |
32 | ctrl_outb(v,DACR); | 32 | __raw_writeb(v,DACR); |
33 | } | 33 | } |
34 | 34 | ||
35 | static __inline__ void sh_dac_output(u8 value, int channel) | 35 | static __inline__ void sh_dac_output(u8 value, int channel) |
36 | { | 36 | { |
37 | if(channel) ctrl_outb(value,DADR1); | 37 | if(channel) __raw_writeb(value,DADR1); |
38 | else ctrl_outb(value,DADR0); | 38 | else __raw_writeb(value,DADR0); |
39 | } | 39 | } |
40 | 40 | ||
41 | #endif /* __ASM_CPU_SH3_DAC_H */ | 41 | #endif /* __ASM_CPU_SH3_DAC_H */ |