diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2016-05-30 06:55:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:18 -0400 |
| commit | 25bab53ab26efdb9e2024477f896be65b6e7191e (patch) | |
| tree | d9e3bee50a8f4bd0f6fab15de8c67b2cc9877cff | |
| parent | 5c2728ff0fb6ade135cc15c4849acac7db1d93d0 (diff) | |
| download | blackbird-obmc-uboot-25bab53ab26efdb9e2024477f896be65b6e7191e.tar.gz blackbird-obmc-uboot-25bab53ab26efdb9e2024477f896be65b6e7191e.zip | |
Remove unneeded remnants of bcopy().
Since bcopy() is no longer used, delete all remaining references to
it.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
| -rw-r--r-- | arch/microblaze/include/asm/string.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/ppcstring.S | 7 | ||||
| -rw-r--r-- | include/linux/string.h | 4 | ||||
| -rw-r--r-- | lib/string.c | 24 |
4 files changed, 0 insertions, 37 deletions
diff --git a/arch/microblaze/include/asm/string.h b/arch/microblaze/include/asm/string.h index 724f5bdfa6..8f67ec785d 100644 --- a/arch/microblaze/include/asm/string.h +++ b/arch/microblaze/include/asm/string.h @@ -17,13 +17,11 @@ #define __MICROBLAZE_STRING_H__ #if 0 -#define __HAVE_ARCH_BCOPY #define __HAVE_ARCH_MEMCPY #define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMMOVE extern void *memcpy (void *, const void *, __kernel_size_t); -extern void bcopy (const char *, char *, int); extern void *memset (void *, int, __kernel_size_t); extern void *memmove (void *, const void *, __kernel_size_t); #endif diff --git a/arch/powerpc/lib/ppcstring.S b/arch/powerpc/lib/ppcstring.S index 8152ac9b0f..56bb3b824e 100644 --- a/arch/powerpc/lib/ppcstring.S +++ b/arch/powerpc/lib/ppcstring.S @@ -92,13 +92,6 @@ memset: bdnz 8b blr - .globl bcopy -bcopy: - mr r6,r3 - mr r3,r4 - mr r4,r6 - b memcpy - .globl memmove memmove: cmplw 0,r3,r4 diff --git a/include/linux/string.h b/include/linux/string.h index c7047ba0bc..091ccab395 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -20,10 +20,6 @@ extern __kernel_size_t strspn(const char *,const char *); */ #include <asm/string.h> -#ifndef __HAVE_ARCH_BCOPY -char *bcopy(const char *src, char *dest, int count); -#endif - #ifndef __HAVE_ARCH_STRCPY extern char * strcpy(char *,const char *); #endif diff --git a/lib/string.c b/lib/string.c index 87c9a408e6..67d5f6a421 100644 --- a/lib/string.c +++ b/lib/string.c @@ -461,30 +461,6 @@ void * memset(void * s,int c,size_t count) } #endif -#ifndef __HAVE_ARCH_BCOPY -/** - * bcopy - Copy one area of memory to another - * @src: Where to copy from - * @dest: Where to copy to - * @count: The size of the area. - * - * Note that this is the same as memcpy(), with the arguments reversed. - * memcpy() is the standard, bcopy() is a legacy BSD function. - * - * You should not use this function to access IO space, use memcpy_toio() - * or memcpy_fromio() instead. - */ -char * bcopy(const char * src, char * dest, int count) -{ - char *tmp = dest; - - while (count--) - *tmp++ = *src++; - - return dest; -} -#endif - #ifndef __HAVE_ARCH_MEMCPY /** * memcpy - Copy one area of memory to another |
