Skip to content

Commit

Permalink
arch/tile: fix memcpy_fromio()/memcpy_toio() signatures
Browse files Browse the repository at this point in the history
This tripped up a driver (not yet committed to git).  Fix it now.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  • Loading branch information
Chris Metcalf committed Sep 15, 2010
1 parent a802fc6 commit 0fab59e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/tile/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,22 @@ static inline void _tile_writeq(u64 val, unsigned long addr)
#define iowrite32 writel
#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;
BUG_ON((unsigned long)src & 0x3);
for (x = 0; x < len; x += 4)
*(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;
BUG_ON((unsigned long)dst & 0x3);
for (x = 0; x < len; x += 4)
writel(*(u32 *)(src + x), dst + x);
return dst;
}

/*
Expand Down

0 comments on commit 0fab59e

Please sign in to comment.