diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:36:37 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:36:37 +0900 |
commit | 0d6ae8fa945aba732edadce1ead9929520d61b99 (patch) | |
tree | b7105a2549eaea6c0fee4026e0f19436dba98b1c /arch | |
parent | 3bd75e5e0c5b58636aeadd34890114bcb988777e (diff) | |
download | op-kernel-dev-0d6ae8fa945aba732edadce1ead9929520d61b99.zip op-kernel-dev-0d6ae8fa945aba732edadce1ead9929520d61b99.tar.gz |
sh: Kill off deprecated ctrl_in/out I/O routines.
Now that all of the in-tree drivers have been converted to portable I/O
accessors, we can kill off the legacy ones with extreme prejudice.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/include/asm/io.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 89ab2c5..70c1186 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -11,11 +11,6 @@ * * While read{b,w,l,q} and write{b,w,l,q} contain memory barriers * automatically, there are also __raw versions, which do not. - * - * Historically, we have also had ctrl_in{b,w,l,q}/ctrl_out{b,w,l,q} for - * SuperH specific I/O (raw I/O to on-chip CPU peripherals). In practice - * these have the same semantics as the __raw variants, and as such, all - * new code should be using the __raw versions. */ #include <linux/errno.h> #include <asm/cache.h> @@ -231,52 +226,6 @@ __BUILD_IOPORT_STRING(q, u64) #endif -/* - * Legacy SuperH on-chip I/O functions - * - * These are all deprecated, all new (and especially cross-platform) code - * should be using the __raw_xxx() routines directly. - */ -static inline u8 __deprecated ctrl_inb(unsigned long addr) -{ - return __raw_readb(addr); -} - -static inline u16 __deprecated ctrl_inw(unsigned long addr) -{ - return __raw_readw(addr); -} - -static inline u32 __deprecated ctrl_inl(unsigned long addr) -{ - return __raw_readl(addr); -} - -static inline u64 __deprecated ctrl_inq(unsigned long addr) -{ - return __raw_readq(addr); -} - -static inline void __deprecated ctrl_outb(u8 v, unsigned long addr) -{ - __raw_writeb(v, addr); -} - -static inline void __deprecated ctrl_outw(u16 v, unsigned long addr) -{ - __raw_writew(v, addr); -} - -static inline void __deprecated ctrl_outl(u32 v, unsigned long addr) -{ - __raw_writel(v, addr); -} - -static inline void __deprecated ctrl_outq(u64 v, unsigned long addr) -{ - __raw_writeq(v, addr); -} - #define IO_SPACE_LIMIT 0xffffffff /* synco on SH-4A, otherwise a nop */ |