Skip to content

Commit

Permalink
[ARM] Remove "translated" io macros
Browse files Browse the repository at this point in the history
The "translated" io macros were never really used.  Remove them.
Preserve the L7200 inb() and friends by defining the __io()
macro, so that the generic versions can be used instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Nov 30, 2006
1 parent 6f4c7e3 commit 9b531ce
Showing 1 changed file with 5 additions and 26 deletions.
31 changes: 5 additions & 26 deletions include/asm-arm/arch-l7200/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,11 @@
/*
* There are not real ISA nor PCI buses, so we fake it.
*/
static inline void __iomem *__io(unsigned long addr)
{
return (void __iomem *)addr;
}
#define __io(a) __io(a)
#define __mem_pci(a) (a)

/*
* Translated address IO functions
*
* IO address has already been translated to a virtual address
*/
#define outb_t(v,p) (*(volatile unsigned char *)(p) = (v))
#define inb_t(p) (*(volatile unsigned char *)(p))
#define outw_t(v,p) (*(volatile unsigned int *)(p) = (v))
#define inw_t(p) (*(volatile unsigned int *)(p))
#define outl_t(v,p) (*(volatile unsigned long *)(p) = (v))
#define inl_t(p) (*(volatile unsigned long *)(p))

/*
* FIXME - These are to allow for linking. On all the other
* ARM platforms, the entire IO space is contiguous.
* The 7200 has three separate IO spaces. The below
* macros will eventually become more involved. Use
* with caution and don't be surprised by kernel oopses!!!
*/
#define inb(p) inb_t(p)
#define inw(p) inw_t(p)
#define inl(p) inl_t(p)
#define outb(v,p) outb_t(v,p)
#define outw(v,p) outw_t(v,p)
#define outl(v,p) outl_t(v,p)

#endif

0 comments on commit 9b531ce

Please sign in to comment.