staging: csr: remove CsrUint32 typedef

Use the in-kernel u32 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>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c
index 7711fa5..c90bf7d 100644
--- a/drivers/staging/csr/csr_wifi_router_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_serialize.c
@@ -32,7 +32,7 @@ CsrSize CsrWifiRouterMaPacketSubscribeReqSizeof(void *msg)
     bufferSize += 2; /* u16 primitive->interfaceTag */
     bufferSize += 1; /* CsrWifiRouterEncapsulation primitive->encapsulation */
     bufferSize += 2; /* u16 primitive->protocol */
-    bufferSize += 4; /* CsrUint32 primitive->oui */
+    bufferSize += 4; /* u32 primitive->oui */
     return bufferSize;
 }
 
@@ -45,7 +45,7 @@ u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, CsrSize *len, void *msg)
     CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag);
     CsrUint8Ser(ptr, len, (u8) primitive->encapsulation);
     CsrUint16Ser(ptr, len, (u16) primitive->protocol);
-    CsrUint32Ser(ptr, len, (CsrUint32) primitive->oui);
+    CsrUint32Ser(ptr, len, (u32) primitive->oui);
     return(ptr);
 }
 
@@ -60,7 +60,7 @@ void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, CsrSize length)
     CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset);
     CsrUint8Des((u8 *) &primitive->encapsulation, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->protocol, buffer, &offset);
-    CsrUint32Des((CsrUint32 *) &primitive->oui, buffer, &offset);
+    CsrUint32Des((u32 *) &primitive->oui, buffer, &offset);
 
     return primitive;
 }
@@ -78,7 +78,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg)
     bufferSize += primitive->frameLength; /* u8 primitive->frame */
     bufferSize += 4;                      /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */
     bufferSize += 2;                      /* CsrWifiRouterPriority primitive->priority */
-    bufferSize += 4;                      /* CsrUint32 primitive->hostTag */
+    bufferSize += 4;                      /* u32 primitive->hostTag */
     bufferSize += 1;                      /* CsrBool primitive->cfmRequested */
     return bufferSize;
 }
@@ -98,7 +98,7 @@ u8* CsrWifiRouterMaPacketReqSer(u8 *ptr, CsrSize *len, void *msg)
     }
     CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->freeFunction */
     CsrUint16Ser(ptr, len, (u16) primitive->priority);
-    CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag);
+    CsrUint32Ser(ptr, len, (u32) primitive->hostTag);
     CsrUint8Ser(ptr, len, (u8) primitive->cfmRequested);
     return(ptr);
 }
@@ -126,7 +126,7 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, CsrSize length)
     primitive->freeFunction = NULL; /* Special for Function Pointers... */
     offset += 4;
     CsrUint16Des((u16 *) &primitive->priority, buffer, &offset);
-    CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset);
+    CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset);
     CsrUint8Des((u8 *) &primitive->cfmRequested, buffer, &offset);
 
     return primitive;
@@ -186,7 +186,7 @@ CsrSize CsrWifiRouterMaPacketCancelReqSizeof(void *msg)
 
     /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */
     bufferSize += 2; /* u16 primitive->interfaceTag */
-    bufferSize += 4; /* CsrUint32 primitive->hostTag */
+    bufferSize += 4; /* u32 primitive->hostTag */
     bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */
     bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */
     return bufferSize;
@@ -199,7 +199,7 @@ u8* CsrWifiRouterMaPacketCancelReqSer(u8 *ptr, CsrSize *len, void *msg)
     *len = 0;
     CsrUint16Ser(ptr, len, primitive->common.type);
     CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag);
-    CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag);
+    CsrUint32Ser(ptr, len, (u32) primitive->hostTag);
     CsrUint16Ser(ptr, len, (u16) primitive->priority);
     CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6)));
     return(ptr);
@@ -214,7 +214,7 @@ void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, CsrSize length)
 
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset);
-    CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset);
+    CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->priority, buffer, &offset);
     CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6)));
 
@@ -307,7 +307,7 @@ CsrSize CsrWifiRouterMaPacketCfmSizeof(void *msg)
     /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */
     bufferSize += 2; /* u16 primitive->interfaceTag */
     bufferSize += 2; /* CsrResult primitive->result */
-    bufferSize += 4; /* CsrUint32 primitive->hostTag */
+    bufferSize += 4; /* u32 primitive->hostTag */
     bufferSize += 2; /* u16 primitive->rate */
     return bufferSize;
 }
@@ -320,7 +320,7 @@ u8* CsrWifiRouterMaPacketCfmSer(u8 *ptr, CsrSize *len, void *msg)
     CsrUint16Ser(ptr, len, primitive->common.type);
     CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag);
     CsrUint16Ser(ptr, len, (u16) primitive->result);
-    CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag);
+    CsrUint32Ser(ptr, len, (u32) primitive->hostTag);
     CsrUint16Ser(ptr, len, (u16) primitive->rate);
     return(ptr);
 }
@@ -335,7 +335,7 @@ void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, CsrSize length)
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->result, buffer, &offset);
-    CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset);
+    CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset);
     CsrUint16Des((u16 *) &primitive->rate, buffer, &offset);
 
     return primitive;