From a6284c2cac561973eea47cf35ab54ca1e09f6515 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Jul 2012 14:35:23 -0700
Subject: [PATCH] --- yaml --- r: 318169 b: refs/heads/master c:
 943b0022df97fbf2a34c4d6cb081e8fcb44032b9 h: refs/heads/master i:   318167:
 380f3a456d4249388c63e049a941f1cf37a2bda5 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/csr/csr_unicode.h | 1 -
 trunk/drivers/staging/csr/csr_utf16.c   | 5 -----
 trunk/drivers/staging/csr/csr_util.c    | 5 -----
 trunk/drivers/staging/csr/csr_util.h    | 2 --
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ed7c37b69519..0c5fc85ba624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 310d5940f521840a92e2572603021c9b58aeab5e
+refs/heads/master: 943b0022df97fbf2a34c4d6cb081e8fcb44032b9
diff --git a/trunk/drivers/staging/csr/csr_unicode.h b/trunk/drivers/staging/csr/csr_unicode.h
index c27b6f9a87f4..96f7dc7a4d78 100644
--- a/trunk/drivers/staging/csr/csr_unicode.h
+++ b/trunk/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/trunk/drivers/staging/csr/csr_utf16.c b/trunk/drivers/staging/csr/csr_utf16.c
index ed0d843e4510..58c17b34845a 100644
--- a/trunk/drivers/staging/csr/csr_utf16.c
+++ b/trunk/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/trunk/drivers/staging/csr/csr_util.c b/trunk/drivers/staging/csr/csr_util.c
index 87075cdf5999..d3b827161c42 100644
--- a/trunk/drivers/staging/csr/csr_util.c
+++ b/trunk/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/trunk/drivers/staging/csr/csr_util.h b/trunk/drivers/staging/csr/csr_util.h
index ffd35df8b4dc..c794358092c6 100644
--- a/trunk/drivers/staging/csr/csr_util.h
+++ b/trunk/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);