OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: csr: remove CsrStrCmp 

Only CsrUtf8StrCmp() was calling it, and nothing was calling
CsrUtf8StrCmp(), so remove both of them.

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>
This commit is contained in:
Greg Kroah-Hartman 2012-07-20 14:35:23 -07:00
parent 310d5940f5
commit 943b0022df
4 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/csr/csr_unicode.h
View File

@ -36,7 +36,6 @@ u16 *CsrUtf16ConcatenateTexts(const u16 *inputText1, const u16 *inputText2,
u16 *CsrUtf16String2XML(u16 *str);
u16 *CsrXML2Utf16String(u16 *str);
s32 CsrUtf8StrCmp(const u8 *string1, const u8 *string2);
s32 CsrUtf8StrNCmp(const u8 *string1, const u8 *string2, size_t count);
u32 CsrUtf8StringLengthInBytes(const u8 *string);

5
drivers/staging/csr/csr_utf16.c
View File

@ -1015,11 +1015,6 @@ u16 *CsrXML2Utf16String(u16 *str)
return resultString;
}
s32 CsrUtf8StrCmp(const u8 *string1, const u8 *string2)
{
return CsrStrCmp((const char *) string1, (const char *) string2);
}
s32 CsrUtf8StrNCmp(const u8 *string1, const u8 *string2, size_t count)
{
return CsrStrNCmp((const char *) string1, (const char *) string2, count);

5
drivers/staging/csr/csr_util.c
View File

@ -51,11 +51,6 @@ size_t CsrStrLen(const char *string)
}
EXPORT_SYMBOL_GPL(CsrStrLen);
s32 CsrStrCmp(const char *string1, const char *string2)
{
return strcmp(string1, string2);
}
s32 CsrStrNCmp(const char *string1, const char *string2, size_t count)
{
return strncmp(string1, string2, count);

2
drivers/staging/csr/csr_util.h
View File

@ -28,13 +28,11 @@ void CsrUInt16ToHex(u16 number, char *str);
/*------------------------------------------------------------------*/
#ifdef CSR_USE_STDC_LIB
#define CsrMemCpy memcpy
#define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
#define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n)))
#define CsrStrChr strchr
#define CsrStrLen strlen
#else /* !CSR_USE_STDC_LIB */
void *CsrMemCpy(void *dest, const void *src, size_t count);
s32 CsrStrCmp(const char *string1, const char *string2);
s32 CsrStrNCmp(const char *string1, const char *string2, size_t count);
char *CsrStrChr(const char *string, char c);
size_t CsrStrLen(const char *string);