staging: csr: remove CsrUint8 typedef

Use the in-kernel u8 type instead.

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>

77 files changed, 2504 insertions, 2505 deletions

diff --git a/drivers/staging/csr/bh.c b/drivers/staging/csr/bh.c
index 6af9d2953ea..bfc2f9ef1b6 100644
--- a/drivers/staging/csr/bh.c
+++ b/drivers/staging/csr/bh.c
@@ -159,7 +159,7 @@ uf_wait_for_thread_to_stop(unifi_priv_t *priv, struct uf_thread *thread)
 handle_bh_error(unifi_priv_t *priv)
 {
     u8 conf_param = CONFIG_IND_ERROR;
-    CsrUint8 interfaceTag = 0; /* used as a loop counter */
+    u8 interfaceTag = 0; /* used as a loop counter */
 
 
     /* Block unifi_run_bh() until the error has been handled. */
diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h
index 171f5feeea9..041bd0950b3 100644
--- a/drivers/staging/csr/csr_lib.h
+++ b/drivers/staging/csr/csr_lib.h
@@ -35,7 +35,7 @@ CsrEvent *CsrEvent_struct(CsrUint16 primtype, CsrUint16 msgtype);
 typedef struct
 {
     CsrPrim  type;
-    CsrUint8 value;
+    u8 value;
 } CsrEventCsrUint8;
 
 /*----------------------------------------------------------------------------*
@@ -46,7 +46,7 @@ typedef struct
  *      Allocates and fills in a message with the signature CsrEventCsrUint8
  *
  *----------------------------------------------------------------------------*/
-CsrEventCsrUint8 *CsrEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint8 value);
+CsrEventCsrUint8 *CsrEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, u8 value);
 
 typedef struct
 {
@@ -68,7 +68,7 @@ typedef struct
 {
     CsrPrim   type;
     CsrUint16 value1;
-    CsrUint8  value2;
+    u8  value2;
 } CsrEventCsrUint16CsrUint8;
 
 /*----------------------------------------------------------------------------*
@@ -79,7 +79,7 @@ typedef struct
  *      Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint8
  *
  *----------------------------------------------------------------------------*/
-CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, CsrUint8 value2);
+CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, u8 value2);
 
 typedef struct
 {
diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h
index db2653c30ea..f86c4920628 100644
--- a/drivers/staging/csr/csr_log.h
+++ b/drivers/staging/csr/csr_log.h
@@ -111,7 +111,7 @@ typedef struct
 /*---------------------------------*/
 /*  Tech logging */
 /*---------------------------------*/
-typedef CsrUint8 bitmask8_t;
+typedef u8 bitmask8_t;
 typedef CsrUint16 bitmask16_t;
 typedef CsrUint32 bitmask32_t;
 
@@ -168,13 +168,13 @@ void CsrLogStateTransition(bitmask16_t mask,
 /*---------------------------------*/
 /*  BSP logging */
 /*---------------------------------*/
-void CsrLogSchedInit(CsrUint8 thread_id);
-void CsrLogSchedDeinit(CsrUint8 thread_id);
+void CsrLogSchedInit(u8 thread_id);
+void CsrLogSchedDeinit(u8 thread_id);
 
-void CsrLogSchedStart(CsrUint8 thread_id);
-void CsrLogSchedStop(CsrUint8 thread_id);
+void CsrLogSchedStart(u8 thread_id);
+void CsrLogSchedStop(u8 thread_id);
 
-void CsrLogInitTask(CsrUint8 thread_id, CsrSchedQid tskid, const CsrCharString *tskName);
+void CsrLogInitTask(u8 thread_id, CsrSchedQid tskid, const CsrCharString *tskName);
 void CsrLogDeinitTask(CsrUint16 task_id);
 
 void CsrLogActivate(CsrSchedQid tskid);
@@ -218,7 +218,7 @@ void CsrLogTimedEventCancel(CsrUint32 line,
     CsrSchedTid tid,
     CsrBool cancel_res);
 
-void CsrLogBgintRegister(CsrUint8 thread_id,
+void CsrLogBgintRegister(u8 thread_id,
     CsrSchedBgint irq,
     const CsrCharString *callback,
     const void *ptr);
diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h
index 3d48bf9762e..8c727adce76 100644
--- a/drivers/staging/csr/csr_log_configure.h
+++ b/drivers/staging/csr/csr_log_configure.h
@@ -20,7 +20,7 @@ extern "C" {
 /*---------------------------------*/
 /* Log init/deinit                 */
 /*---------------------------------*/
-void CsrLogInit(CsrUint8 size);
+void CsrLogInit(u8 size);
 void CsrLogDeinit(void);
 
 /*---------------------------------*/
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h
index 2e3dcac4f33..e8de0a7bab9 100644
--- a/drivers/staging/csr/csr_macro.h
+++ b/drivers/staging/csr/csr_macro.h
@@ -31,39 +31,39 @@ extern "C" {
 /*------------------------------------------------------------------*/
 /* Endian conversion */
 /*------------------------------------------------------------------*/
-#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint16) ((CsrUint8 *) (ptr))[0]) | ((CsrUint16) ((CsrUint8 *) (ptr))[1]) << 8)
-#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint32) ((CsrUint8 *) (ptr))[0]) | ((CsrUint32) ((CsrUint8 *) (ptr))[1]) << 8 | \
-                                                       ((CsrUint32) ((CsrUint8 *) (ptr))[2]) << 16 | ((CsrUint32) ((CsrUint8 *) (ptr))[3]) << 24)
-#define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) & 0x00FF)); \
-    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) ((uint) >> 8))
-#define CSR_COPY_UINT32_TO_LITTLE_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) (((uint) >> 16) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[3] = ((CsrUint8) (((uint) >> 24) & 0x000000FF))
-#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((CsrUint16) ((CsrUint8 *) (ptr))[1]) | ((CsrUint16) ((CsrUint8 *) (ptr))[0]) << 8)
-#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((CsrUint24) ((CsrUint8 *) (ptr))[2]) | \
-                                             ((CsrUint24) ((CsrUint8 *) (ptr))[1]) << 8 | ((CsrUint24) ((CsrUint8 *) (ptr))[0]) << 16)
-#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((CsrUint8 *) (ptr))[3]) | ((CsrUint32) ((CsrUint8 *) (ptr))[2]) << 8 | \
-                                             ((CsrUint32) ((CsrUint8 *) (ptr))[1]) << 16 | ((CsrUint32) ((CsrUint8 *) (ptr))[0]) << 24)
-#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) ((uint) & 0x00FF)); \
-    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) >> 8))
-#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) ((uint) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) (((uint) >> 16) & 0x000000FF))
-#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[3] = ((CsrUint8) ((uint) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 16) & 0x000000FF)); \
-    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) (((uint) >> 24) & 0x000000FF))
+#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint16) ((u8 *) (ptr))[0]) | ((CsrUint16) ((u8 *) (ptr))[1]) << 8)
+#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint32) ((u8 *) (ptr))[0]) | ((CsrUint32) ((u8 *) (ptr))[1]) << 8 | \
+                                                       ((CsrUint32) ((u8 *) (ptr))[2]) << 16 | ((CsrUint32) ((u8 *) (ptr))[3]) << 24)
+#define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr)    ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x00FF)); \
+    ((u8 *) (ptr))[1] = ((u8) ((uint) >> 8))
+#define CSR_COPY_UINT32_TO_LITTLE_ENDIAN(uint, ptr)    ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x000000FF)); \
+    ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
+    ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \
+    ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF))
+#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((CsrUint16) ((u8 *) (ptr))[1]) | ((CsrUint16) ((u8 *) (ptr))[0]) << 8)
+#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((CsrUint24) ((u8 *) (ptr))[2]) | \
+                                             ((CsrUint24) ((u8 *) (ptr))[1]) << 8 | ((CsrUint24) ((u8 *) (ptr))[0]) << 16)
+#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[3]) | ((CsrUint32) ((u8 *) (ptr))[2]) << 8 | \
+                                             ((CsrUint32) ((u8 *) (ptr))[1]) << 16 | ((CsrUint32) ((u8 *) (ptr))[0]) << 24)
+#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \
+    ((u8 *) (ptr))[0] = ((u8) ((uint) >> 8))
+#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[2] = ((u8) ((uint) & 0x000000FF)); \
+    ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
+    ((u8 *) (ptr))[0] = ((u8) (((uint) >> 16) & 0x000000FF))
+#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[3] = ((u8) ((uint) & 0x000000FF)); \
+    ((u8 *) (ptr))[2] = ((u8) (((uint) >> 8) & 0x000000FF)); \
+    ((u8 *) (ptr))[1] = ((u8) (((uint) >> 16) & 0x000000FF)); \
+    ((u8 *) (ptr))[0] = ((u8) (((uint) >> 24) & 0x000000FF))
 
 /*------------------------------------------------------------------*/
 /* XAP conversion macros */
 /*------------------------------------------------------------------*/
 
-#define CSR_LSB16(a) ((CsrUint8) ((a) & 0x00ff))
-#define CSR_MSB16(b) ((CsrUint8) ((b) >> 8))
+#define CSR_LSB16(a) ((u8) ((a) & 0x00ff))
+#define CSR_MSB16(b) ((u8) ((b) >> 8))
 
 #define CSR_CONVERT_8_FROM_XAP(output, input) \
-    (output) = ((CsrUint8) (input));(input) += 2
+    (output) = ((u8) (input));(input) += 2
 
 #define CSR_CONVERT_16_FROM_XAP(output, input) \
     (output) = (CsrUint16) ((((CsrUint16) (input)[1]) << 8) | \
@@ -80,14 +80,14 @@ extern "C" {
     (output)[1] = 0;(output) += 2
 
 #define CSR_ADD_UINT16_TO_XAP(output, input) \
-    (output)[0] = ((CsrUint8) ((input) & 0x00FF));  \
-    (output)[1] = ((CsrUint8) ((input) >> 8));(output) += 2
+    (output)[0] = ((u8) ((input) & 0x00FF));  \
+    (output)[1] = ((u8) ((input) >> 8));(output) += 2
 
 #define CSR_ADD_UINT32_TO_XAP(output, input) \
-    (output)[0] = ((CsrUint8) (((input) >> 16) & 0x00FF)); \
-    (output)[1] = ((CsrUint8) ((input) >> 24)); \
-    (output)[2] = ((CsrUint8) ((input) & 0x00FF)); \
-    (output)[3] = ((CsrUint8) (((input) >> 8) & 0x00FF));(output) += 4
+    (output)[0] = ((u8) (((input) >> 16) & 0x00FF)); \
+    (output)[1] = ((u8) ((input) >> 24)); \
+    (output)[2] = ((u8) ((input) & 0x00FF)); \
+    (output)[3] = ((u8) (((input) >> 8) & 0x00FF));(output) += 4
 
 /*------------------------------------------------------------------*/
 /* Misc */
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index 9f1c946c66f..3f57b042c8f 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -73,10 +73,10 @@ static const CsrMsgConvMsgEntry *find_msg_converter(CsrMsgConvPrimEntry *ptr, Cs
 
 static void *deserialize_data(CsrUint16 primType,
     CsrSize length,
-    CsrUint8 *data)
+    u8 *data)
 {
     CsrMsgConvPrimEntry *ptr;
-    CsrUint8 *ret;
+    u8 *ret;
 
     ptr = CsrMsgConvFind(primType);
 
@@ -133,7 +133,7 @@ static CsrSize sizeof_message(CsrUint16 primType, void *msg)
     return ret;
 }
 
-static CsrBool free_message(CsrUint16 primType, CsrUint8 *data)
+static CsrBool free_message(CsrUint16 primType, u8 *data)
 {
     CsrMsgConvPrimEntry *ptr;
     CsrBool ret;
@@ -164,13 +164,13 @@ static CsrBool free_message(CsrUint16 primType, CsrUint8 *data)
     return ret;
 }
 
-static CsrUint8 *serialize_message(CsrUint16 primType,
+static u8 *serialize_message(CsrUint16 primType,
     void *msg,
     CsrSize *length,
-    CsrUint8 *buffer)
+    u8 *buffer)
 {
     CsrMsgConvPrimEntry *ptr;
-    CsrUint8 *ret;
+    u8 *ret;
 
     ptr = CsrMsgConvFind(primType);
 
@@ -203,13 +203,13 @@ CsrSize CsrMsgConvSizeof(CsrUint16 primType, void *msg)
     return sizeof_message(primType, msg);
 }
 
-CsrUint8 *CsrMsgConvSerialize(CsrUint8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg)
+u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg)
 {
     if (converter)
     {
         CsrSize serializedLength;
-        CsrUint8 *bufSerialized;
-        CsrUint8 *bufOffset = &buffer[*offset];
+        u8 *bufSerialized;
+        u8 *bufOffset = &buffer[*offset];
         bufSerialized = converter->serialize_message(primType, msg, &serializedLength, bufOffset);
         *offset += serializedLength;
         return bufSerialized;
diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h
index 2875c8c6941..dd4853d5ce6 100644
--- a/drivers/staging/csr/csr_msgconv.h
+++ b/drivers/staging/csr/csr_msgconv.h
@@ -21,9 +21,9 @@ extern "C" {
 #endif
 
 typedef CsrSize (CsrMsgSizeofFunc)(void *msg);
-typedef CsrUint8 *(CsrMsgSerializeFunc)(CsrUint8 *buffer, CsrSize *length, void *msg);
+typedef u8 *(CsrMsgSerializeFunc)(u8 *buffer, CsrSize *length, void *msg);
 typedef void (CsrMsgFreeFunc)(void *msg);
-typedef void *(CsrMsgDeserializeFunc)(CsrUint8 *buffer, CsrSize length);
+typedef void *(CsrMsgDeserializeFunc)(u8 *buffer, CsrSize length);
 
 /* Converter entry for one message type */
 typedef struct CsrMsgConvMsgEntry
@@ -50,16 +50,16 @@ typedef struct CsrMsgConvPrimEntry
 typedef struct
 {
     CsrMsgConvPrimEntry *profile_converters;
-    void *(*deserialize_data)(CsrUint16 primType, CsrSize length, CsrUint8 * data);
-    CsrBool (*free_message)(CsrUint16 primType, CsrUint8 *data);
+    void *(*deserialize_data)(CsrUint16 primType, CsrSize length, u8 * data);
+    CsrBool (*free_message)(CsrUint16 primType, u8 *data);
     CsrSize (*sizeof_message)(CsrUint16 primType, void *msg);
-    CsrUint8 *(*serialize_message)(CsrUint16 primType, void *msg,
+    u8 *(*serialize_message)(CsrUint16 primType, void *msg,
                                    CsrSize * length,
-                                   CsrUint8 * buffer);
+                                   u8 * buffer);
 } CsrMsgConvEntry;
 
 CsrSize CsrMsgConvSizeof(CsrUint16 primType, void *msg);
-CsrUint8 *CsrMsgConvSerialize(CsrUint8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg);
+u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg);
 void CsrMsgConvCustomLookupRegister(CsrUint16 primType, CsrMsgCustomLookupFunc *lookupFunc);
 void CsrMsgConvInsert(CsrUint16 primType, const CsrMsgConvMsgEntry *ce);
 CsrMsgConvPrimEntry *CsrMsgConvFind(CsrUint16 primType);
@@ -78,65 +78,65 @@ CsrUint32 CsrUtf8StringSerLen(const CsrUtf8String *str);
 CsrUint32 CsrUtf16StringSerLen(const CsrUtf16String *str);
 
 /* Prototypes for primitive type serializers */
-void CsrUint8Ser(CsrUint8 *buffer, CsrSize *offset, CsrUint8 value);
-void CsrUint16Ser(CsrUint8 *buffer, CsrSize *offset, CsrUint16 value);
-void CsrUint32Ser(CsrUint8 *buffer, CsrSize *offset, CsrUint32 value);
-void CsrMemCpySer(CsrUint8 *buffer, CsrSize *offset, const void *value, CsrSize length);
-void CsrCharStringSer(CsrUint8 *buffer, CsrSize *offset, const CsrCharString *value);
-void CsrUtf8StringSer(CsrUint8 *buffer, CsrSize *offset, const CsrUtf8String *value);
-void CsrUtf16StringSer(CsrUint8 *buffer, CsrSize *offset, const CsrUtf16String *value);
-void CsrVoidPtrSer(CsrUint8 *buffer, CsrSize *offset, void *ptr);
-void CsrSizeSer(CsrUint8 *buffer, CsrSize *offset, CsrSize value);
-
-void CsrUint8Des(CsrUint8 *value, CsrUint8 *buffer, CsrSize *offset);
-void CsrUint16Des(CsrUint16 *value, CsrUint8 *buffer, CsrSize *offset);
-void CsrUint32Des(CsrUint32 *value, CsrUint8 *buffer, CsrSize *offset);
-void CsrMemCpyDes(void *value, CsrUint8 *buffer, CsrSize *offset, CsrSize length);
-void CsrCharStringDes(CsrCharString **value, CsrUint8 *buffer, CsrSize *offset);
-void CsrUtf8StringDes(CsrUtf8String **value, CsrUint8 *buffer, CsrSize *offset);
-void CsrUtf16StringDes(CsrUtf16String **value, CsrUint8 *buffer, CsrSize *offset);
-void CsrVoidPtrDes(void **value, CsrUint8 *buffer, CsrSize *offset);
-void CsrSizeDes(CsrSize *value, CsrUint8 *buffer, CsrSize *offset);
+void CsrUint8Ser(u8 *buffer, CsrSize *offset, u8 value);
+void CsrUint16Ser(u8 *buffer, CsrSize *offset, CsrUint16 value);
+void CsrUint32Ser(u8 *buffer, CsrSize *offset, CsrUint32 value);<