From 45755da2d88b7e0ff9ab037968d64f27f0820317 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 14:39:57 -0700 Subject: [PATCH] staging: csr: remove CsrStrNCmp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Only CsrUtf8StrNCmp() was calling it, and nothing was calling CsrUtf8StrNCmp(), 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(-) diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index 96f7dc7..a6ddb1f 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 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 58c17b3..3d47491 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 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 d3b8271..f7fd3fb 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 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 c794358..95030fa 100644 --- 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 */ -- 2.7.4