h63xx: tsc2101 alsa sound support

[linux-2.6-omap-h63xx.git] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index 54eb3f81f85ef22a8e9d42b133263368b98ec2a8..037a48acedbb21aae00269c87ef9f1821fb1bb67 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -36,7 +36,7 @@ int strnicmp(const char *s1, const char *s2, size_t len)
        /* Yes, Virginia, it had better be unsigned */
        unsigned char c1, c2;
 
-       c1 = 0; c2 = 0;
+       c1 = c2 = 0;
        if (len) {
                do {
                        c1 = *s1;
@@ -148,7 +148,6 @@ char *strcat(char *dest, const char *src)
                dest++;
        while ((*dest++ = *src++) != '\0')
                ;
-
        return tmp;
 }
 EXPORT_SYMBOL(strcat);
@@ -219,7 +218,7 @@ EXPORT_SYMBOL(strlcat);
 #undef strcmp
 int strcmp(const char *cs, const char *ct)
 {
-       register signed char __res;
+       signed char __res;
 
        while (1) {
                if ((__res = *cs - *ct++) != 0 || !*cs++)
@@ -239,7 +238,7 @@ EXPORT_SYMBOL(strcmp);
  */
 int strncmp(const char *cs, const char *ct, size_t count)
 {
-       register signed char __res = 0;
+       signed char __res = 0;
 
        while (count) {
                if ((__res = *cs - *ct++) != 0 || !*cs++)
@@ -447,7 +446,7 @@ EXPORT_SYMBOL(strsep);
  */
 void *memset(void *s, int c, size_t count)
 {
-       char *xs = (char *)s;
+       char *xs = s;
 
        while (count--)
                *xs++ = c;
@@ -468,8 +467,8 @@ EXPORT_SYMBOL(memset);
  */
 void *memcpy(void *dest, const void *src, size_t count)
 {
-       char *tmp = (char *)dest;
-       char *s = (char *)src;
+       char *tmp = dest;
+       char *s = src;
 
        while (count--)
                *tmp++ = *s++;
@@ -489,16 +488,19 @@ EXPORT_SYMBOL(memcpy);
  */
 void *memmove(void *dest, const void *src, size_t count)
 {
-       char *tmp, *s;
+       char *tmp;
+       const char *s;
 
        if (dest <= src) {
-               tmp = (char *)dest;
-               s = (char *)src;
+               tmp = dest;
+               s = src;
                while (count--)
                        *tmp++ = *s++;
        } else {
-               tmp = (char *)dest + count;
-               s = (char *)src + count;
+               tmp = dest;
+               tmp += count;
+               s = src;
+               s += count;
                while (count--)
                        *--tmp = *--s;
        }
@@ -540,7 +542,7 @@ EXPORT_SYMBOL(memcmp);
  */
 void *memscan(void *addr, int c, size_t size)
 {
-       unsigned char *p = (unsigned char *)addr;
+       unsigned char *p = addr;
 
        while (size) {
                if (*p == c)