From d2c6fbec4397c936b18cd42482b6973cd6781bdf Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 1 May 2008 21:30:16 +0200 Subject: [PATCH] onenand: rename 16 bit memory copy into memcpy_16() to avoid conflicts Onenand needs a version of memcpy() which performs 16 bit accesses only; make sure the name does not conflict with the standard function. Signed-off-by: Wolfgang Denk --- drivers/mtd/onenand/onenand_base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 174384e..d1b9f8f 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -21,7 +21,7 @@ #include /* It should access 16-bit instead of 8-bit */ -static inline void *memcpy(void *dst, const void *src, unsigned int len) +static inline void *memcpy_16(void *dst, const void *src, unsigned int len) { void *ret = dst; short *d = dst; @@ -358,7 +358,7 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area, bufferram = this->base + area; bufferram += onenand_bufferram_offset(mtd, area); - memcpy(buffer, bufferram + offset, count); + memcpy_16(buffer, bufferram + offset, count); return 0; } @@ -385,7 +385,7 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area, this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ); - memcpy(buffer, bufferram + offset, count); + memcpy_16(buffer, bufferram + offset, count); this->mmcontrol(mtd, 0); @@ -412,7 +412,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area, bufferram = this->base + area; bufferram += onenand_bufferram_offset(mtd, area); - memcpy(bufferram + offset, buffer, count); + memcpy_16(bufferram + offset, buffer, count); return 0; } -- 2.7.4