Browse Source

arch/tile: fix memcpy_fromio()/memcpy_toio() signatures

This tripped up a driver (not yet committed to git).  Fix it now.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Chris Metcalf 14 years ago
parent
commit
0fab59e5dd
1 changed files with 4 additions and 4 deletions
  1. 4 4
      arch/tile/include/asm/io.h

+ 4 - 4
arch/tile/include/asm/io.h

@@ -164,22 +164,22 @@ static inline void _tile_writeq(u64 val, unsigned long addr)
 #define iowrite32 writel
 #define iowrite32 writel
 #define iowrite64 writeq
 #define iowrite64 writeq
 
 
-static inline void *memcpy_fromio(void *dst, void *src, int len)
+static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
+				 size_t len)
 {
 {
 	int x;
 	int x;
 	BUG_ON((unsigned long)src & 0x3);
 	BUG_ON((unsigned long)src & 0x3);
 	for (x = 0; x < len; x += 4)
 	for (x = 0; x < len; x += 4)
 		*(u32 *)(dst + x) = readl(src + x);
 		*(u32 *)(dst + x) = readl(src + x);
-	return dst;
 }
 }
 
 
-static inline void *memcpy_toio(void *dst, void *src, int len)
+static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
+				size_t len)
 {
 {
 	int x;
 	int x;
 	BUG_ON((unsigned long)dst & 0x3);
 	BUG_ON((unsigned long)dst & 0x3);
 	for (x = 0; x < len; x += 4)
 	for (x = 0; x < len; x += 4)
 		writel(*(u32 *)(src + x), dst + x);
 		writel(*(u32 *)(src + x), dst + x);
-	return dst;
 }
 }
 
 
 /*
 /*