Commit 25bab53ab26efdb9e2024477f896be65b6e7191e

Authored by Robert P. J. Day
Committed by Tom Rini
1 parent 5c2728ff0f

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>

Showing 4 changed files with 0 additions and 37 deletions Side-by-side Diff

arch/microblaze/include/asm/string.h
... ... @@ -17,13 +17,11 @@
17 17 #define __MICROBLAZE_STRING_H__
18 18  
19 19 #if 0
20   -#define __HAVE_ARCH_BCOPY
21 20 #define __HAVE_ARCH_MEMCPY
22 21 #define __HAVE_ARCH_MEMSET
23 22 #define __HAVE_ARCH_MEMMOVE
24 23  
25 24 extern void *memcpy (void *, const void *, __kernel_size_t);
26   -extern void bcopy (const char *, char *, int);
27 25 extern void *memset (void *, int, __kernel_size_t);
28 26 extern void *memmove (void *, const void *, __kernel_size_t);
29 27 #endif
arch/powerpc/lib/ppcstring.S
... ... @@ -92,13 +92,6 @@
92 92 bdnz 8b
93 93 blr
94 94  
95   - .globl bcopy
96   -bcopy:
97   - mr r6,r3
98   - mr r3,r4
99   - mr r4,r6
100   - b memcpy
101   -
102 95 .globl memmove
103 96 memmove:
104 97 cmplw 0,r3,r4
include/linux/string.h
... ... @@ -20,10 +20,6 @@
20 20 */
21 21 #include <asm/string.h>
22 22  
23   -#ifndef __HAVE_ARCH_BCOPY
24   -char *bcopy(const char *src, char *dest, int count);
25   -#endif
26   -
27 23 #ifndef __HAVE_ARCH_STRCPY
28 24 extern char * strcpy(char *,const char *);
29 25 #endif
... ... @@ -461,30 +461,6 @@
461 461 }
462 462 #endif
463 463  
464   -#ifndef __HAVE_ARCH_BCOPY
465   -/**
466   - * bcopy - Copy one area of memory to another
467   - * @src: Where to copy from
468   - * @dest: Where to copy to
469   - * @count: The size of the area.
470   - *
471   - * Note that this is the same as memcpy(), with the arguments reversed.
472   - * memcpy() is the standard, bcopy() is a legacy BSD function.
473   - *
474   - * You should not use this function to access IO space, use memcpy_toio()
475   - * or memcpy_fromio() instead.
476   - */
477   -char * bcopy(const char * src, char * dest, int count)
478   -{
479   - char *tmp = dest;
480   -
481   - while (count--)
482   - *tmp++ = *src++;
483   -
484   - return dest;
485   -}
486   -#endif
487   -
488 464 #ifndef __HAVE_ARCH_MEMCPY
489 465 /**
490 466 * memcpy - Copy one area of memory to another