staging: csr: remove CsrStrNCmp

Only CsrUtf8StrNCmp() was calling it, and nothing was calling
CsrUtf8StrNCmp(), 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 96f7dc7a4d7858abbb9a296c1bff847c261fb062..a6ddb1f5c34f26a76083368de04bf7282a8cb253 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 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 58c17b34845adde7206ecaf585ed4f2c2a5f3d2d..3d47491fd9a2cf714c8ea2c9fe060ea241a60666 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 CsrUtf8StrNCmp(const u8 *string1, const u8 *string2, size_t count)
-{
-    return CsrStrNCmp((const char *) string1, (const char *) string2, count);
-}
-
 u32 CsrUtf8StringLengthInBytes(const u8 *string)
 {
     size_t length = 0;

diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index d3b827161c42d8054a8b37b34bf4ae8b18993413..f7fd3fb7b5069d360ced5ee3dc29f5abf2aca0e1 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 CsrStrNCmp(const char *string1, const char *string2, size_t count)
-{
-    return strncmp(string1, string2, count);
-}
-
 char *CsrStrChr(const char *string, char c)
 {
     return strchr(string, c);

diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index c794358092c6ca595413b4f73c8537ff44b463ba..95030fa29ce73e72a7b14ed6327a9a134b5e13d3 100644 (file)
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -28,12 +28,10 @@ void CsrUInt16ToHex(u16 number, char *str);
 /*------------------------------------------------------------------*/
 #ifdef CSR_USE_STDC_LIB
 #define CsrMemCpy memcpy
-#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 CsrStrNCmp(const char *string1, const char *string2, size_t count);
 char *CsrStrChr(const char *string, char c);
 size_t CsrStrLen(const char *string);
 #endif /* !CSR_USE_STDC_LIB */