summaryrefslogtreecommitdiff
path: root/drivers/staging/csr/csr_util.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 12:27:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 12:27:19 -0700
commitd4fda8db9796271ddd306583e1afa9df23ae1558 (patch)
treecd7500ded2261b9bc35e05a23cb54af665060881 /drivers/staging/csr/csr_util.c
parent5379b13d9e063e9bb2078a1c642f8df8c914e022 (diff)
staging: csr: remove CsrSize typedef
Use size_t instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_util.c')
-rw-r--r--drivers/staging/csr/csr_util.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index afb57835f848..fa2b2b437f16 100644
--- a/drivers/staging/csr/csr_util.c
+++ b/drivers/staging/csr/csr_util.c
@@ -222,31 +222,31 @@ void CsrUInt32ToHex(u32 number, char *str)
/* String */
/*------------------------------------------------------------------*/
#ifndef CSR_USE_STDC_LIB
-void *CsrMemCpy(void *dest, const void *src, CsrSize count)
+void *CsrMemCpy(void *dest, const void *src, size_t count)
{
return memcpy(dest, src, count);
}
EXPORT_SYMBOL_GPL(CsrMemCpy);
-void *CsrMemSet(void *dest, u8 c, CsrSize count)
+void *CsrMemSet(void *dest, u8 c, size_t count)
{
return memset(dest, c, count);
}
EXPORT_SYMBOL_GPL(CsrMemSet);
-void *CsrMemMove(void *dest, const void *src, CsrSize count)
+void *CsrMemMove(void *dest, const void *src, size_t count)
{
return memmove(dest, src, count);
}
EXPORT_SYMBOL_GPL(CsrMemMove);
-s32 CsrMemCmp(const void *buf1, const void *buf2, CsrSize count)
+s32 CsrMemCmp(const void *buf1, const void *buf2, size_t count)
{
return memcmp(buf1, buf2, count);
}
EXPORT_SYMBOL_GPL(CsrMemCmp);
-void *CsrMemDup(const void *buf1, CsrSize count)
+void *CsrMemDup(const void *buf1, size_t count)
{
void *buf2 = NULL;
@@ -266,7 +266,7 @@ char *CsrStrCpy(char *dest, const char *src)
return strcpy(dest, src);
}
-char *CsrStrNCpy(char *dest, const char *src, CsrSize count)
+char *CsrStrNCpy(char *dest, const char *src, size_t count)
{
return strncpy(dest, src, count);
}
@@ -276,7 +276,7 @@ char *CsrStrCat(char *dest, const char *src)
return strcat(dest, src);
}
-char *CsrStrNCat(char *dest, const char *src, CsrSize count)
+char *CsrStrNCat(char *dest, const char *src, size_t count)
{
return strncat(dest, src, count);
}
@@ -286,7 +286,7 @@ char *CsrStrStr(const char *string1, const char *string2)
return strstr(string1, string2);
}
-CsrSize CsrStrLen(const char *string)
+size_t CsrStrLen(const char *string)
{
return strlen(string);
}
@@ -297,7 +297,7 @@ s32 CsrStrCmp(const char *string1, const char *string2)
return strcmp(string1, string2);
}
-s32 CsrStrNCmp(const char *string1, const char *string2, CsrSize count)
+s32 CsrStrNCmp(const char *string1, const char *string2, size_t count)
{
return strncmp(string1, string2, count);
}
@@ -308,7 +308,7 @@ char *CsrStrChr(const char *string, char c)
}
#endif
-s32 CsrVsnprintf(char *string, CsrSize count, const char *format, va_list args)
+s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args)
{
return vsnprintf(string, count, format, args);
}
@@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(CsrVsnprintf);
char *CsrStrNCpyZero(char *dest,
const char *src,
- CsrSize count)
+ size_t count)
{
CsrStrNCpy(dest, src, count - 1);
dest[count - 1] = '\0';
@@ -364,7 +364,7 @@ char *CsrStrDup(const char *string)
int CsrStrNICmp(const char *string1,
const char *string2,
- CsrSize count)
+ size_t count)
{
u32 index;
int returnValue = 0;