Skip to content

Commit

Permalink
sh: Kill off deprecated ctrl_in/out I/O routines.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Jan 11, 2011
1 parent 3bd75e5 commit 0d6ae8f
Showing 1 changed file with 0 additions and 51 deletions.
51 changes: 0 additions & 51 deletions arch/sh/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 0d6ae8f

Please sign in to comment.