staging: csr: remove a bunch of unused functions in csr_util.c

[pandora-kernel.git] / drivers / staging / csr / csr_util.h

diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index 610d35e..3561344 100644 (file)
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -14,25 +14,14 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
+#include <linux/kernel.h>
+#include <linux/types.h>
 #include "csr_macro.h"
 
-/*------------------------------------------------------------------*/
-/* Bits - intended to operate on CsrUint32 values */
-/*------------------------------------------------------------------*/
-u8 CsrBitCountSparse(CsrUint32 n);
-u8 CsrBitCountDense(CsrUint32 n);
-
 /*------------------------------------------------------------------*/
 /* Base conversion */
 /*------------------------------------------------------------------*/
-CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue);
-CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue);
-CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue);
-CsrUint32 CsrPow(CsrUint32 base, CsrUint32 exponent);
-void CsrIntToBase10(CsrInt32 number, CsrCharString *str);
-void CsrUInt16ToHex(u16 number, CsrCharString *str);
-void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str);
+void CsrUInt16ToHex(u16 number, char *str);
 
 /*------------------------------------------------------------------*/
 /* Standard C Library functions */
@@ -42,51 +31,32 @@ void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str);
 #define CsrMemMove memmove
 #define CsrStrCpy strcpy
 #define CsrStrNCpy strncpy
-#define CsrStrCat strcat
-#define CsrStrNCat strncat
-#define CsrMemCmp(s1, s2, n) ((CsrInt32) memcmp((s1), (s2), (n)))
-#define CsrStrCmp(s1, s2) ((CsrInt32) strcmp((s1), (s2)))
-#define CsrStrNCmp(s1, s2, n) ((CsrInt32) strncmp((s1), (s2), (n)))
+#define CsrMemCmp(s1, s2, n) ((s32) memcmp((s1), (s2), (n)))
+#define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
+#define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n)))
 #define CsrStrChr strchr
-#define CsrStrStr strstr
 #define CsrMemSet memset
 #define CsrStrLen strlen
 #else /* !CSR_USE_STDC_LIB */
-void *CsrMemCpy(void *dest, const void *src, CsrSize count);
-void *CsrMemMove(void *dest, const void *src, CsrSize count);
-CsrCharString *CsrStrCpy(CsrCharString *dest, const CsrCharString *src);
-CsrCharString *CsrStrNCpy(CsrCharString *dest, const CsrCharString *src, CsrSize count);
-CsrCharString *CsrStrCat(CsrCharString *dest, const CsrCharString *src);
-CsrCharString *CsrStrNCat(CsrCharString *dest, const CsrCharString *src, CsrSize count);
-CsrInt32 CsrMemCmp(const void *buf1, const void *buf2, CsrSize count);
-CsrInt32 CsrStrCmp(const CsrCharString *string1, const CsrCharString *string2);
-CsrInt32 CsrStrNCmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count);
-CsrCharString *CsrStrChr(const CsrCharString *string, CsrCharString c);
-CsrCharString *CsrStrStr(const CsrCharString *string1, const CsrCharString *string2);
-void *CsrMemSet(void *dest, u8 c, CsrSize count);
-CsrSize CsrStrLen(const CsrCharString *string);
+void *CsrMemCpy(void *dest, const void *src, size_t count);
+void *CsrMemMove(void *dest, const void *src, size_t count);
+char *CsrStrCpy(char *dest, const char *src);
+char *CsrStrNCpy(char *dest, const char *src, size_t count);
+s32 CsrMemCmp(const void *buf1, const void *buf2, 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);
+void *CsrMemSet(void *dest, u8 c, size_t count);
+size_t CsrStrLen(const char *string);
 #endif /* !CSR_USE_STDC_LIB */
-CsrInt32 CsrVsnprintf(CsrCharString *string, CsrSize count, const CsrCharString *format, va_list args);
+s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args);
 
 /*------------------------------------------------------------------*/
 /* Non-standard utility functions */
 /*------------------------------------------------------------------*/
-void *CsrMemDup(const void *buf1, CsrSize count);
-int CsrStrNICmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count);
-CsrCharString *CsrStrDup(const CsrCharString *string);
-CsrUint32 CsrStrToInt(const CsrCharString *string);
-CsrCharString *CsrStrNCpyZero(CsrCharString *dest, const CsrCharString *src, CsrSize count);
-
-/*------------------------------------------------------------------*/
-/* Filename */
-/*------------------------------------------------------------------*/
-const CsrCharString *CsrGetBaseName(const CsrCharString *file);
+char *CsrStrDup(const char *string);
 
-/*------------------------------------------------------------------*/
-/* Misc */
-/*------------------------------------------------------------------*/
-CsrBool CsrIsSpace(u8 c);
-#define CsrOffsetOf(st, m)  ((CsrSize) & ((st *) 0)->m)
+#define CsrOffsetOf(st, m)  ((size_t) & ((st *) 0)->m)
 
 #ifdef __cplusplus
 }