diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-10-01 08:12:27 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-01 08:12:27 +0200 |
commit | 64c9627c2628bc3bd3291710b8ee6f8335883f8b (patch) | |
tree | fee0816511f68f687f500a7e7ae7c8adf92a0f45 /arch/sh/lib | |
parent | sh: Use clk fwk for preset lpj on sh64, too. (diff) | |
download | linux-64c9627c2628bc3bd3291710b8ee6f8335883f8b.tar.xz linux-64c9627c2628bc3bd3291710b8ee6f8335883f8b.zip |
sh: Fix up the __raw_read/writeX() definitions.
These were doing largely bogus things and using the wrong typing for
the address. Bring these in line with the ARM definitions.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/lib')
-rw-r--r-- | arch/sh/lib/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/lib/io.c b/arch/sh/lib/io.c index 4f54ec43516f..88dfe6e396bc 100644 --- a/arch/sh/lib/io.c +++ b/arch/sh/lib/io.c @@ -14,12 +14,12 @@ #include <linux/module.h> #include <linux/io.h> -void __raw_readsl(unsigned long addr, void *datap, int len) +void __raw_readsl(const void __iomem *addr, void *datap, int len) { u32 *data; for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--) - *data++ = ctrl_inl(addr); + *data++ = __raw_readl(addr); if (likely(len >= (0x20 >> 2))) { int tmp2, tmp3, tmp4, tmp5, tmp6; @@ -59,11 +59,11 @@ void __raw_readsl(unsigned long addr, void *datap, int len) } for (; len != 0; len--) - *data++ = ctrl_inl(addr); + *data++ = __raw_readl(addr); } EXPORT_SYMBOL(__raw_readsl); -void __raw_writesl(unsigned long addr, const void *data, int len) +void __raw_writesl(void __iomem *addr, const void *data, int len) { if (likely(len != 0)) { int tmp1; |