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>

diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h
index c27b6f9a87f40422174d1953385a3e5a4587a506..96f7dc7a4d7858abbb9a296c1bff847c261fb062 100644 (file)
--- a/drivers/staging/csr/csr_unicode.h
+++ b/drivers/staging/csr/csr_unicode.h
@@ -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);
 

diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index ed0d843e4510c8d3d854586d780425749c847c1f..58c17b34845adde7206ecaf585ed4f2c2a5f3d2d 100644 (file)
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -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);

diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index 87075cdf59998feed61f8753eef518087c94d782..d3b827161c42d8054a8b37b34bf4ae8b18993413 100644 (file)
--- a/drivers/staging/csr/csr_util.c
+++ b/drivers/staging/csr/csr_util.c
@@ -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);

diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index ffd35df8b4dc1518b1452bc24f4be73e5f627e24..c794358092c6ca595413b4f73c8537ff44b463ba 100644 (file)
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -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);