Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux...

[platform/kernel/linux-arm64.git] / drivers / staging / csr / csr_wifi_serialize_primitive_types.c

diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index 5b5444a..dd93d00 100644 (file)
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -9,14 +9,13 @@
 *****************************************************************************/
 
 #include <linux/module.h>
-#include "csr_types.h"
-#include "csr_pmem.h"
-#include "csr_util.h"
+#include <linux/slab.h>
+#include "csr_macro.h"
 #include "csr_msgconv.h"
 #include "csr_wifi_msgconv.h"
 #include "csr_wifi_lib.h"
 
-void CsrUint24Des(u32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint24Des(u32 *v, u8 *buffer, size_t *offset)
 {
     u32 val;
 
@@ -30,7 +29,7 @@ void CsrUint24Des(u32 *v, u8 *buffer, CsrSize *offset)
 
 
 /* Big endian :e.g WSC, TCLAS */
-void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset)
+void CsrUint16DesBigEndian(u16 *v, u8 *buffer, size_t *offset)
 {
     u16 val;
 
@@ -41,7 +40,7 @@ void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset)
 }
 
 
-void CsrUint24DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint24DesBigEndian(u32 *v, u8 *buffer, size_t *offset)
 {
     u32 val;
 
@@ -54,7 +53,7 @@ void CsrUint24DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
 }
 
 
-void CsrUint32DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint32DesBigEndian(u32 *v, u8 *buffer, size_t *offset)
 {
     u32 val;
 
@@ -68,7 +67,7 @@ void CsrUint32DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
 }
 
 
-void CsrUint24Ser(u8 *ptr, CsrSize *len, u32 v)
+void CsrUint24Ser(u8 *ptr, size_t *len, u32 v)
 {
     ptr[(*len) + 2] = (u8)((v & 0x00ff0000) >> 16);
     ptr[(*len) + 1] = (u8)((v & 0x0000ff00) >> 8);
@@ -79,7 +78,7 @@ void CsrUint24Ser(u8 *ptr, CsrSize *len, u32 v)
 
 
 /* Big endian :e.g WSC, TCLAS */
-void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v)
+void CsrUint16SerBigEndian(u8 *ptr, size_t *len, u16 v)
 {
     ptr[(*len)] = (u8)((v & 0xff00) >> 8);
     ptr[(*len) + 1] = (u8)((v & 0x00ff));
@@ -88,7 +87,7 @@ void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v)
 }
 
 
-void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
+void CsrUint32SerBigEndian(u8 *ptr, size_t *len, u32 v)
 {
     ptr[(*len)] = (u8)((v & 0xff000000) >> 24);
     ptr[(*len) + 1] = (u8)((v & 0x00ff0000) >> 16);
@@ -99,7 +98,7 @@ void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
 }
 
 
-void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
+void CsrUint24SerBigEndian(u8 *ptr, size_t *len, u32 v)
 {
     ptr[(*len)] = (u8)((v & 0x00ff0000) >> 16);
     ptr[(*len) + 1] = (u8)((v & 0x0000ff00) >> 8);
@@ -109,13 +108,13 @@ void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
 }
 
 
-CsrSize CsrWifiEventSizeof(void *msg)
+size_t CsrWifiEventSizeof(void *msg)
 {
     return 2;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventSizeof);
 
-u8* CsrWifiEventSer(u8 *ptr, CsrSize *len, void *msg)
+u8* CsrWifiEventSer(u8 *ptr, size_t *len, void *msg)
 {
     CsrWifiFsmEvent *primitive = (CsrWifiFsmEvent *)msg;
     *len = 0;
@@ -124,23 +123,23 @@ u8* CsrWifiEventSer(u8 *ptr, CsrSize *len, void *msg)
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventSer);
 
-void* CsrWifiEventDes(u8 *buffer, CsrSize length)
+void* CsrWifiEventDes(u8 *buffer, size_t length)
 {
-    CsrWifiFsmEvent *primitive = (CsrWifiFsmEvent *) CsrPmemAlloc(sizeof(CsrWifiFsmEvent));
-    CsrSize offset = 0;
+    CsrWifiFsmEvent *primitive = kmalloc(sizeof(CsrWifiFsmEvent), GFP_KERNEL);
+    size_t offset = 0;
     CsrUint16Des(&primitive->type, buffer, &offset);
 
     return primitive;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventDes);
 
-CsrSize CsrWifiEventCsrUint8Sizeof(void *msg)
+size_t CsrWifiEventCsrUint8Sizeof(void *msg)
 {
     return 3;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint8Sizeof);
 
-u8* CsrWifiEventCsrUint8Ser(u8 *ptr, CsrSize *len, void *msg)
+u8* CsrWifiEventCsrUint8Ser(u8 *ptr, size_t *len, void *msg)
 {
     CsrWifiEventCsrUint8 *primitive = (CsrWifiEventCsrUint8 *)msg;
     *len = 0;
@@ -151,11 +150,11 @@ u8* CsrWifiEventCsrUint8Ser(u8 *ptr, CsrSize *len, void *msg)
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint8Ser);
 
 
-void* CsrWifiEventCsrUint8Des(u8 *buffer, CsrSize length)
+void* CsrWifiEventCsrUint8Des(u8 *buffer, size_t length)
 {
-    CsrWifiEventCsrUint8 *primitive = (CsrWifiEventCsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint8));
+    CsrWifiEventCsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint8), GFP_KERNEL);
 
-    CsrSize offset = 0;
+    size_t offset = 0;
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint8Des(&primitive->value, buffer, &offset);
 
@@ -164,14 +163,14 @@ void* CsrWifiEventCsrUint8Des(u8 *buffer, CsrSize length)
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint8Des);
 
 
-CsrSize CsrWifiEventCsrUint16Sizeof(void *msg)
+size_t CsrWifiEventCsrUint16Sizeof(void *msg)
 {
     return 4;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16Sizeof);
 
 
-u8* CsrWifiEventCsrUint16Ser(u8 *ptr, CsrSize *len, void *msg)
+u8* CsrWifiEventCsrUint16Ser(u8 *ptr, size_t *len, void *msg)
 {
     CsrWifiEventCsrUint16 *primitive = (CsrWifiEventCsrUint16 *)msg;
     *len = 0;
@@ -181,11 +180,11 @@ u8* CsrWifiEventCsrUint16Ser(u8 *ptr, CsrSize *len, void *msg)
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16Ser);
 
-void* CsrWifiEventCsrUint16Des(u8 *buffer, CsrSize length)
+void* CsrWifiEventCsrUint16Des(u8 *buffer, size_t length)
 {
-    CsrWifiEventCsrUint16 *primitive = (CsrWifiEventCsrUint16 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16));
+    CsrWifiEventCsrUint16 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16), GFP_KERNEL);
 
-    CsrSize offset = 0;
+    size_t offset = 0;
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint16Des(&primitive->value, buffer, &offset);
 
@@ -194,13 +193,13 @@ void* CsrWifiEventCsrUint16Des(u8 *buffer, CsrSize length)
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16Des);
 
 
-CsrSize CsrWifiEventCsrUint32Sizeof(void *msg)
+size_t CsrWifiEventCsrUint32Sizeof(void *msg)
 {
     return 6;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint32Sizeof);
 
-u8* CsrWifiEventCsrUint32Ser(u8 *ptr, CsrSize *len, void *msg)
+u8* CsrWifiEventCsrUint32Ser(u8 *ptr, size_t *len, void *msg)
 {
     CsrWifiEventCsrUint32 *primitive = (CsrWifiEventCsrUint32 *)msg;
     *len = 0;
@@ -211,11 +210,11 @@ u8* CsrWifiEventCsrUint32Ser(u8 *ptr, CsrSize *len, void *msg)
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint32Ser);
 
 
-void* CsrWifiEventCsrUint32Des(u8 *buffer, CsrSize length)
+void* CsrWifiEventCsrUint32Des(u8 *buffer, size_t length)
 {
-    CsrWifiEventCsrUint32 *primitive = (CsrWifiEventCsrUint32 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint32));
+    CsrWifiEventCsrUint32 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint32), GFP_KERNEL);
 
-    CsrSize offset = 0;
+    size_t offset = 0;
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint32Des(&primitive->value, buffer, &offset);
 
@@ -223,13 +222,13 @@ void* CsrWifiEventCsrUint32Des(u8 *buffer, CsrSize length)
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint32Des);
 
-CsrSize CsrWifiEventCsrUint16CsrUint8Sizeof(void *msg)
+size_t CsrWifiEventCsrUint16CsrUint8Sizeof(void *msg)
 {
     return 5;
 }
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16CsrUint8Sizeof);
 
-u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, CsrSize *len, void *msg)
+u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg)
 {
     CsrWifiEventCsrUint16CsrUint8 *primitive = (CsrWifiEventCsrUint16CsrUint8 *)msg;
     *len = 0;
@@ -241,11 +240,11 @@ u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, CsrSize *len, void *msg)
 EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16CsrUint8Ser);
 
 
-void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, CsrSize length)
+void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length)
 {
-    CsrWifiEventCsrUint16CsrUint8 *primitive = (CsrWifiEventCsrUint16CsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16CsrUint8));
+    CsrWifiEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16CsrUint8), GFP_KERNEL);
 
-    CsrSize offset = 0;
+    size_t offset = 0;
     CsrUint16Des(&primitive->common.type, buffer, &offset);
     CsrUint16Des(&primitive->value16, buffer, &offset);
     CsrUint8Des(&primitive->value8, buffer, &offset);