diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-05-28 16:43:48 +0200 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-06-22 22:44:57 +0200 |
| commit | 79e90dd5aa95adfdc3117db8a559da3d0195ba58 (patch) | |
| tree | be2a760b39e8f295aca136da03c05490c77a0b48 /include/asm-arm | |
| parent | 0e3bc0503f7e7b5b0bd4416f43eeeca1b661e66e (diff) | |
| download | blackbird-op-linux-79e90dd5aa95adfdc3117db8a559da3d0195ba58.tar.gz blackbird-op-linux-79e90dd5aa95adfdc3117db8a559da3d0195ba58.zip | |
[ARM] Orion: nuke orion5x_{read,write}
Nuke the Orion-specific orion5x_{read,write} wrappers.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-orion5x/io.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-arm/arch-orion5x/io.h b/include/asm-arm/arch-orion5x/io.h index d9a4b2065e53..59f1bc96a23b 100644 --- a/include/asm-arm/arch-orion5x/io.h +++ b/include/asm-arm/arch-orion5x/io.h @@ -52,15 +52,12 @@ static inline void __iomem *__io(unsigned long addr) /***************************************************************************** * Helpers to access Orion registers ****************************************************************************/ -#define orion5x_read(r) __raw_readl(r) -#define orion5x_write(r, val) __raw_writel(val, r) - /* * These are not preempt-safe. Locks, if needed, must be taken * care of by the caller. */ -#define orion5x_setbits(r, mask) orion5x_write((r), orion5x_read(r) | (mask)) -#define orion5x_clrbits(r, mask) orion5x_write((r), orion5x_read(r) & ~(mask)) +#define orion5x_setbits(r, mask) writel(readl(r) | (mask), (r)) +#define orion5x_clrbits(r, mask) writel(readl(r) & ~(mask), (r)) #endif |
