From 943b0022df97fbf2a34c4d6cb081e8fcb44032b9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 14:35:23 -0700 Subject: staging: csr: remove CsrStrCmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only CsrUtf8StrCmp() was calling it, and nothing was calling CsrUtf8StrCmp(), so remove both of them. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_unicode.h | 1 - drivers/staging/csr/csr_utf16.c | 5 ----- drivers/staging/csr/csr_util.c | 5 ----- drivers/staging/csr/csr_util.h | 2 -- 4 files changed, 13 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index c27b6f9a87f..96f7dc7a4d7 100644 --- 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 ed0d843e451..58c17b34845 100644 --- 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 87075cdf599..d3b827161c4 100644 --- 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 ffd35df8b4d..c794358092c 100644 --- 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); -- cgit v1.2.3