aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/csr/csr_msgconv.c5
-rw-r--r--drivers/staging/csr/csr_pmem.c11
-rw-r--r--drivers/staging/csr/csr_pmem.h15
-rw-r--r--drivers/staging/csr/csr_sched.h2
-rw-r--r--drivers/staging/csr/csr_utf16.c5
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c10
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_serialize.c15
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c24
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c18
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_serialize.c67
-rw-r--r--drivers/staging/csr/csr_wifi_router_free_downstream_contents.c4
-rw-r--r--drivers/staging/csr/csr_wifi_router_free_upstream_contents.c4
-rw-r--r--drivers/staging/csr/csr_wifi_router_serialize.c12
-rw-r--r--drivers/staging/csr/csr_wifi_router_transport.c4
-rw-r--r--drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c46
-rw-r--r--drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c90
-rw-r--r--drivers/staging/csr/csr_wifi_sme_serialize.c211
-rw-r--r--drivers/staging/csr/drv.c10
-rw-r--r--drivers/staging/csr/putest.c4
-rw-r--r--drivers/staging/csr/sme_blocking.c4
-rw-r--r--drivers/staging/csr/sme_userspace.c2
-rw-r--r--drivers/staging/csr/ul_int.c10
-rw-r--r--drivers/staging/csr/unifi_sme.c12
23 files changed, 282 insertions, 303 deletions
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index 04ce4ae49ccd..42e0a4aef0a7 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -10,6 +10,7 @@
10 10
11#include <linux/module.h> 11#include <linux/module.h>
12#include <linux/types.h> 12#include <linux/types.h>
13#include <linux/slab.h>
13#include "csr_pmem.h" 14#include "csr_pmem.h"
14#include "csr_panic.h" 15#include "csr_panic.h"
15#include "csr_sched.h" 16#include "csr_sched.h"
@@ -312,11 +313,11 @@ void CsrMsgConvDeinit(void)
312 { 313 {
313 CsrMsgConvPrimEntry *s_next; 314 CsrMsgConvPrimEntry *s_next;
314 s_next = s->next; 315 s_next = s->next;
315 CsrPmemFree(s); 316 kfree(s);
316 s = s_next; 317 s = s_next;
317 } 318 }
318 319
319 CsrPmemFree(converter); 320 kfree(converter);
320 converter = NULL; 321 converter = NULL;
321} 322}
322EXPORT_SYMBOL_GPL(CsrMsgConvDeinit); 323EXPORT_SYMBOL_GPL(CsrMsgConvDeinit);
diff --git a/drivers/staging/csr/csr_pmem.c b/drivers/staging/csr/csr_pmem.c
index aeb924289099..a2779256005c 100644
--- a/drivers/staging/csr/csr_pmem.c
+++ b/drivers/staging/csr/csr_pmem.c
@@ -38,14 +38,3 @@ void *CsrPmemAlloc(size_t size)
38 return ret; 38 return ret;
39} 39}
40EXPORT_SYMBOL_GPL(CsrPmemAlloc); 40EXPORT_SYMBOL_GPL(CsrPmemAlloc);
41
42void CsrPmemFree(void *ptr)
43{
44 if (ptr == NULL)
45 {
46 return;
47 }
48
49 kfree(ptr);
50}
51EXPORT_SYMBOL_GPL(CsrPmemFree);
diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h
index 5e8b6a08c63e..283aff09d867 100644
--- a/drivers/staging/csr/csr_pmem.h
+++ b/drivers/staging/csr/csr_pmem.h
@@ -45,20 +45,6 @@ void *CsrPmemAllocDebug(size_t size,
45void *CsrPmemAlloc(size_t size); 45void *CsrPmemAlloc(size_t size);
46#endif 46#endif
47 47
48
49/*****************************************************************************
50
51 NAME
52 CsrPmemFree
53
54 DESCRIPTION
55 This function will deallocate a previously allocated block of memory.
56
57 PARAMETERS
58 ptr - Pointer to allocated memory.
59
60*****************************************************************************/
61void CsrPmemFree(void *ptr);
62#endif 48#endif
63 49
64/***************************************************************************** 50/*****************************************************************************
@@ -131,7 +117,6 @@ void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* fil
131#define CsrPmemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__) 117#define CsrPmemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__)
132 118
133void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line); 119void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line);
134#define CsrPmemFree(ptr) CsrPmemDebugFree(ptr, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__)
135 120
136#endif 121#endif
137 122
diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h
index e42fca9a859f..7ae1ea5b3229 100644
--- a/drivers/staging/csr/csr_sched.h
+++ b/drivers/staging/csr/csr_sched.h
@@ -125,7 +125,7 @@ void CsrSchedBgintSet(CsrSchedBgint bgint);
125 * obey the convention that when a message built with CsrPmemAlloc()ed memory 125 * obey the convention that when a message built with CsrPmemAlloc()ed memory
126 * is given to CsrSchedMessagePut() then ownership of the memory is ceded to the 126 * is given to CsrSchedMessagePut() then ownership of the memory is ceded to the
127 * scheduler - and eventually to the recipient task. I.e., the receiver of 127 * scheduler - and eventually to the recipient task. I.e., the receiver of
128 * the message will be expected to CsrPmemFree() the message storage. 128 * the message will be expected to kfree() the message storage.
129 * 129 *
130 * RETURNS 130 * RETURNS
131 * void. 131 * void.
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index be48097cd0db..f827342b1487 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -8,6 +8,7 @@
8 8
9*****************************************************************************/ 9*****************************************************************************/
10#include <linux/module.h> 10#include <linux/module.h>
11#include <linux/slab.h>
11#include "csr_pmem.h" 12#include "csr_pmem.h"
12#include "csr_unicode.h" 13#include "csr_unicode.h"
13#include "csr_macro.h" 14#include "csr_macro.h"
@@ -881,7 +882,7 @@ u16 *CsrUtf16String2XML(u16 *str)
881 882
882 *outputString++ = 0; 883 *outputString++ = 0;
883 884
884 CsrPmemFree(str); 885 kfree(str);
885 } 886 }
886 } 887 }
887 888
@@ -1008,7 +1009,7 @@ u16 *CsrXML2Utf16String(u16 *str)
1008 1009
1009 *outputString++ = 0; 1010 *outputString++ = 0;
1010 1011
1011 CsrPmemFree(str); 1012 kfree(str);
1012 } 1013 }
1013 } 1014 }
1014 1015
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
index 68123968ae93..bfc511ed49d1 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_nme_ap_prim.h" 14#include "csr_wifi_nme_ap_prim.h"
15#include "csr_wifi_nme_ap_lib.h" 15#include "csr_wifi_nme_ap_lib.h"
@@ -41,7 +41,7 @@ void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_NME_AP_CONFIG_SET_REQ: 41 case CSR_WIFI_NME_AP_CONFIG_SET_REQ:
42 { 42 {
43 CsrWifiNmeApConfigSetReq *p = (CsrWifiNmeApConfigSetReq *)message; 43 CsrWifiNmeApConfigSetReq *p = (CsrWifiNmeApConfigSetReq *)message;
44 CsrPmemFree(p->apMacConfig.macAddressList); 44 kfree(p->apMacConfig.macAddressList);
45 p->apMacConfig.macAddressList = NULL; 45 p->apMacConfig.macAddressList = NULL;
46 break; 46 break;
47 } 47 }
@@ -54,7 +54,7 @@ void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message)
54 switch (p->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase) 54 switch (p->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase)
55 { 55 {
56 case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE: 56 case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE:
57 CsrPmemFree(p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase); 57 kfree(p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase);
58 p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase = NULL; 58 p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase = NULL;
59 break; 59 break;
60 default: 60 default:
@@ -68,11 +68,11 @@ void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message)
68 u16 i3; 68 u16 i3;
69 for (i3 = 0; i3 < p->p2pGoParam.operatingChanList.channelEntryListCount; i3++) 69 for (i3 = 0; i3 < p->p2pGoParam.operatingChanList.channelEntryListCount; i3++)
70 { 70 {
71 CsrPmemFree(p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel); 71 kfree(p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel);
72 p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = NULL; 72 p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = NULL;
73 } 73 }
74 } 74 }
75 CsrPmemFree(p->p2pGoParam.operatingChanList.channelEntryList); 75 kfree(p->p2pGoParam.operatingChanList.channelEntryList);
76 p->p2pGoParam.operatingChanList.channelEntryList = NULL; 76 p->p2pGoParam.operatingChanList.channelEntryList = NULL;
77 break; 77 break;
78 } 78 }
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
index b673c1ca421b..dcdcc32b597c 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
@@ -10,6 +10,7 @@
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/slab.h>
13#include "csr_pmem.h" 14#include "csr_pmem.h"
14#include "csr_msgconv.h" 15#include "csr_msgconv.h"
15#include "csr_unicode.h" 16#include "csr_unicode.h"
@@ -22,7 +23,7 @@
22 23
23void CsrWifiNmeApPfree(void *ptr) 24void CsrWifiNmeApPfree(void *ptr)
24{ 25{
25 CsrPmemFree(ptr); 26 kfree(ptr);
26} 27}
27 28
28 29
@@ -221,8 +222,8 @@ void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length)
221void CsrWifiNmeApConfigSetReqSerFree(void *voidPrimitivePointer) 222void CsrWifiNmeApConfigSetReqSerFree(void *voidPrimitivePointer)
222{ 223{
223 CsrWifiNmeApConfigSetReq *primitive = (CsrWifiNmeApConfigSetReq *) voidPrimitivePointer; 224 CsrWifiNmeApConfigSetReq *primitive = (CsrWifiNmeApConfigSetReq *) voidPrimitivePointer;
224 CsrPmemFree(primitive->apMacConfig.macAddressList); 225 kfree(primitive->apMacConfig.macAddressList);
225 CsrPmemFree(primitive); 226 kfree(primitive);
226} 227}
227 228
228 229
@@ -555,7 +556,7 @@ void CsrWifiNmeApStartReqSerFree(void *voidPrimitivePointer)
555 switch (primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase) 556 switch (primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase)
556 { 557 {
557 case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE: 558 case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE:
558 CsrPmemFree(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase); 559 kfree(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase);
559 break; 560 break;
560 default: 561 default:
561 break; 562 break;
@@ -568,11 +569,11 @@ void CsrWifiNmeApStartReqSerFree(void *voidPrimitivePointer)
568 u16 i3; 569 u16 i3;
569 for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++) 570 for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++)
570 { 571 {
571 CsrPmemFree(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel); 572 kfree(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel);
572 } 573 }
573 } 574 }
574 CsrPmemFree(primitive->p2pGoParam.operatingChanList.channelEntryList); 575 kfree(primitive->p2pGoParam.operatingChanList.channelEntryList);
575 CsrPmemFree(primitive); 576 kfree(primitive);
576} 577}
577 578
578 579
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
index 2329dc3af8a9..b4b724356c1e 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_router_ctrl_prim.h" 14#include "csr_wifi_router_ctrl_prim.h"
15#include "csr_wifi_router_ctrl_lib.h" 15#include "csr_wifi_router_ctrl_lib.h"
@@ -41,62 +41,62 @@ void CsrWifiRouterCtrlFreeDownstreamMessageContents(u16 eventClass, void *messag
41 case CSR_WIFI_ROUTER_CTRL_HIP_REQ: 41 case CSR_WIFI_ROUTER_CTRL_HIP_REQ:
42 { 42 {
43 CsrWifiRouterCtrlHipReq *p = (CsrWifiRouterCtrlHipReq *)message; 43 CsrWifiRouterCtrlHipReq *p = (CsrWifiRouterCtrlHipReq *)message;
44 CsrPmemFree(p->mlmeCommand); 44 kfree(p->mlmeCommand);
45 p->mlmeCommand = NULL; 45 p->mlmeCommand = NULL;
46 CsrPmemFree(p->dataRef1); 46 kfree(p->dataRef1);
47 p->dataRef1 = NULL; 47 p->dataRef1 = NULL;
48 CsrPmemFree(p->dataRef2); 48 kfree(p->dataRef2);
49 p->dataRef2 = NULL; 49 p->dataRef2 = NULL;
50 break; 50 break;
51 } 51 }
52 case CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_RES: 52 case CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_RES:
53 { 53 {
54 CsrWifiRouterCtrlMulticastAddressRes *p = (CsrWifiRouterCtrlMulticastAddressRes *)message; 54 CsrWifiRouterCtrlMulticastAddressRes *p = (CsrWifiRouterCtrlMulticastAddressRes *)message;
55 CsrPmemFree(p->getAddresses); 55 kfree(p->getAddresses);
56 p->getAddresses = NULL; 56 p->getAddresses = NULL;
57 break; 57 break;
58 } 58 }
59 case CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_REQ: 59 case CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_REQ:
60 { 60 {
61 CsrWifiRouterCtrlTclasAddReq *p = (CsrWifiRouterCtrlTclasAddReq *)message; 61 CsrWifiRouterCtrlTclasAddReq *p = (CsrWifiRouterCtrlTclasAddReq *)message;
62 CsrPmemFree(p->tclas); 62 kfree(p->tclas);
63 p->tclas = NULL; 63 p->tclas = NULL;
64 break; 64 break;
65 } 65 }
66 case CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_REQ: 66 case CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_REQ:
67 { 67 {
68 CsrWifiRouterCtrlTclasDelReq *p = (CsrWifiRouterCtrlTclasDelReq *)message; 68 CsrWifiRouterCtrlTclasDelReq *p = (CsrWifiRouterCtrlTclasDelReq *)message;
69 CsrPmemFree(p->tclas); 69 kfree(p->tclas);
70 p->tclas = NULL; 70 p->tclas = NULL;
71 break; 71 break;
72 } 72 }
73 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_REQ: 73 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_REQ:
74 { 74 {
75 CsrWifiRouterCtrlWifiOnReq *p = (CsrWifiRouterCtrlWifiOnReq *)message; 75 CsrWifiRouterCtrlWifiOnReq *p = (CsrWifiRouterCtrlWifiOnReq *)message;
76 CsrPmemFree(p->data); 76 kfree(p->data);
77 p->data = NULL; 77 p->data = NULL;
78 break; 78 break;
79 } 79 }
80 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_RES: 80 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_RES:
81 { 81 {
82 CsrWifiRouterCtrlWifiOnRes *p = (CsrWifiRouterCtrlWifiOnRes *)message; 82 CsrWifiRouterCtrlWifiOnRes *p = (CsrWifiRouterCtrlWifiOnRes *)message;
83 CsrPmemFree(p->smeVersions.smeBuild); 83 kfree(p->smeVersions.smeBuild);
84 p->smeVersions.smeBuild = NULL; 84 p->smeVersions.smeBuild = NULL;
85 break; 85 break;
86 } 86 }
87 case CSR_WIFI_ROUTER_CTRL_WAPI_RX_PKT_REQ: 87 case CSR_WIFI_ROUTER_CTRL_WAPI_RX_PKT_REQ:
88 { 88 {
89 CsrWifiRouterCtrlWapiRxPktReq *p = (CsrWifiRouterCtrlWapiRxPktReq *)message; 89 CsrWifiRouterCtrlWapiRxPktReq *p = (CsrWifiRouterCtrlWapiRxPktReq *)message;
90 CsrPmemFree(p->signal); 90 kfree(p->signal);
91 p->signal = NULL; 91 p->signal = NULL;
92 CsrPmemFree(p->data); 92 kfree(p->data);
93 p->data = NULL; 93 p->data = NULL;
94 break; 94 break;
95 } 95 }
96 case CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_PKT_REQ: 96 case CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_PKT_REQ:
97 { 97 {
98 CsrWifiRouterCtrlWapiUnicastTxPktReq *p = (CsrWifiRouterCtrlWapiUnicastTxPktReq *)message; 98 CsrWifiRouterCtrlWapiUnicastTxPktReq *p = (CsrWifiRouterCtrlWapiUnicastTxPktReq *)message;
99 CsrPmemFree(p->data); 99 kfree(p->data);
100 p->data = NULL; 100 p->data = NULL;
101 break; 101 break;
102 } 102 }
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
index 8f1ce3d93e8f..4605c535b3b9 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_router_ctrl_prim.h" 14#include "csr_wifi_router_ctrl_prim.h"
15#include "csr_wifi_router_ctrl_lib.h" 15#include "csr_wifi_router_ctrl_lib.h"
@@ -41,41 +41,41 @@ void CsrWifiRouterCtrlFreeUpstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_ROUTER_CTRL_HIP_IND: 41 case CSR_WIFI_ROUTER_CTRL_HIP_IND:
42 { 42 {
43 CsrWifiRouterCtrlHipInd *p = (CsrWifiRouterCtrlHipInd *)message; 43 CsrWifiRouterCtrlHipInd *p = (CsrWifiRouterCtrlHipInd *)message;
44 CsrPmemFree(p->mlmeCommand); 44 kfree(p->mlmeCommand);
45 p->mlmeCommand = NULL; 45 p->mlmeCommand = NULL;
46 CsrPmemFree(p->dataRef1); 46 kfree(p->dataRef1);
47 p->dataRef1 = NULL; 47 p->dataRef1 = NULL;
48 CsrPmemFree(p->dataRef2); 48 kfree(p->dataRef2);
49 p->dataRef2 = NULL; 49 p->dataRef2 = NULL;
50 break; 50 break;
51 } 51 }
52 case CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_IND: 52 case CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_IND:
53 { 53 {
54 CsrWifiRouterCtrlMulticastAddressInd *p = (CsrWifiRouterCtrlMulticastAddressInd *)message; 54 CsrWifiRouterCtrlMulticastAddressInd *p = (CsrWifiRouterCtrlMulticastAddressInd *)message;
55 CsrPmemFree(p->setAddresses); 55 kfree(p->setAddresses);
56 p->setAddresses = NULL; 56 p->setAddresses = NULL;
57 break; 57 break;
58 } 58 }
59 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_IND: 59 case CSR_WIFI_ROUTER_CTRL_WIFI_ON_IND:
60 { 60 {
61 CsrWifiRouterCtrlWifiOnInd *p = (CsrWifiRouterCtrlWifiOnInd *)message; 61 CsrWifiRouterCtrlWifiOnInd *p = (CsrWifiRouterCtrlWifiOnInd *)message;
62 CsrPmemFree(p->versions.routerBuild); 62 kfree(p->versions.routerBuild);
63 p->versions.routerBuild = NULL; 63 p->versions.routerBuild = NULL;
64 break; 64 break;
65 } 65 }
66 case CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND: 66 case CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND:
67 { 67 {
68 CsrWifiRouterCtrlWapiRxMicCheckInd *p = (CsrWifiRouterCtrlWapiRxMicCheckInd *)message; 68 CsrWifiRouterCtrlWapiRxMicCheckInd *p = (CsrWifiRouterCtrlWapiRxMicCheckInd *)message;
69 CsrPmemFree(p->signal); 69 kfree(p->signal);
70 p->signal = NULL; 70 p->signal = NULL;
71 CsrPmemFree(p->data); 71 kfree(p->data);
72 p->data = NULL; 72 p->data = NULL;
73 break; 73 break;
74 } 74 }
75 case CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND: 75 case CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND:
76 { 76 {
77 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *p = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *)message; 77 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *p = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *)message;
78 CsrPmemFree(p->data); 78 kfree(p->data);
79 p->data = NULL; 79 p->data = NULL;
80 break; 80 break;
81 } 81 }
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
index 330eb9523904..7340f58b6599 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
@@ -10,6 +10,7 @@
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/slab.h>
13#include "csr_pmem.h" 14#include "csr_pmem.h"
14#include "csr_msgconv.h" 15#include "csr_msgconv.h"
15#include "csr_unicode.h" 16#include "csr_unicode.h"
@@ -20,7 +21,7 @@
20 21
21void CsrWifiRouterCtrlPfree(void *ptr) 22void CsrWifiRouterCtrlPfree(void *ptr)
22{ 23{
23 CsrPmemFree(ptr); 24 kfree(ptr);
24} 25}
25 26
26 27
@@ -148,10 +149,10 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length)
148void CsrWifiRouterCtrlHipReqSerFree(void *voidPrimitivePointer) 149void CsrWifiRouterCtrlHipReqSerFree(void *voidPrimitivePointer)
149{ 150{
150 CsrWifiRouterCtrlHipReq *primitive = (CsrWifiRouterCtrlHipReq *) voidPrimitivePointer; 151 CsrWifiRouterCtrlHipReq *primitive = (CsrWifiRouterCtrlHipReq *) voidPrimitivePointer;
151 CsrPmemFree(primitive->mlmeCommand); 152 kfree(primitive->mlmeCommand);
152 CsrPmemFree(primitive->dataRef1); 153 kfree(primitive->dataRef1);
153 CsrPmemFree(primitive->dataRef2); 154 kfree(primitive->dataRef2);
154 CsrPmemFree(primitive); 155 kfree(primitive);
155} 156}
156 157
157 158
@@ -269,8 +270,8 @@ void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length)
269void CsrWifiRouterCtrlMulticastAddressResSerFree(void *voidPrimitivePointer) 270void CsrWifiRouterCtrlMulticastAddressResSerFree(void *voidPrimitivePointer)
270{ 271{
271 CsrWifiRouterCtrlMulticastAddressRes *primitive = (CsrWifiRouterCtrlMulticastAddressRes *) voidPrimitivePointer; 272 CsrWifiRouterCtrlMulticastAddressRes *primitive = (CsrWifiRouterCtrlMulticastAddressRes *) voidPrimitivePointer;
272 CsrPmemFree(primitive->getAddresses); 273 kfree(primitive->getAddresses);
273 CsrPmemFree(primitive); 274 kfree(primitive);
274} 275}
275 276
276 277
@@ -457,8 +458,8 @@ void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length)
457void CsrWifiRouterCtrlTclasAddReqSerFree(void *voidPrimitivePointer) 458void CsrWifiRouterCtrlTclasAddReqSerFree(void *voidPrimitivePointer)
458{ 459{
459 CsrWifiRouterCtrlTclasAddReq *primitive = (CsrWifiRouterCtrlTclasAddReq *) voidPrimitivePointer; 460 CsrWifiRouterCtrlTclasAddReq *primitive = (CsrWifiRouterCtrlTclasAddReq *) voidPrimitivePointer;
460 CsrPmemFree(primitive->tclas); 461 kfree(primitive->tclas);
461 CsrPmemFree(primitive); 462 kfree(primitive);
462} 463}
463 464
464 465
@@ -555,8 +556,8 @@ void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length)
555void CsrWifiRouterCtrlTclasDelReqSerFree(void *voidPrimitivePointer) 556void CsrWifiRouterCtrlTclasDelReqSerFree(void *voidPrimitivePointer)
556{ 557{
557 CsrWifiRouterCtrlTclasDelReq *primitive = (CsrWifiRouterCtrlTclasDelReq *) voidPrimitivePointer; 558 CsrWifiRouterCtrlTclasDelReq *primitive = (CsrWifiRouterCtrlTclasDelReq *) voidPrimitivePointer;
558 CsrPmemFree(primitive->tclas); 559 kfree(primitive->tclas);
559 CsrPmemFree(primitive); 560 kfree(primitive);
560} 561}
561 562
562 563
@@ -710,8 +711,8 @@ void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length)
710void CsrWifiRouterCtrlWifiOnReqSerFree(void *voidPrimitivePointer) 711void CsrWifiRouterCtrlWifiOnReqSerFree(void *voidPrimitivePointer)
711{ 712{
712 CsrWifiRouterCtrlWifiOnReq *primitive = (CsrWifiRouterCtrlWifiOnReq *) voidPrimitivePointer; 713 CsrWifiRouterCtrlWifiOnReq *primitive = (CsrWifiRouterCtrlWifiOnReq *) voidPrimitivePointer;
713 CsrPmemFree(primitive->data); 714 kfree(primitive->data);
714 CsrPmemFree(primitive); 715 kfree(primitive);
715} 716}
716 717
717 718
@@ -791,8 +792,8 @@ void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, size_t length)
791void CsrWifiRouterCtrlWifiOnResSerFree(void *voidPrimitivePointer) 792void CsrWifiRouterCtrlWifiOnResSerFree(void *voidPrimitivePointer)
792{ 793{
793 CsrWifiRouterCtrlWifiOnRes *primitive = (CsrWifiRouterCtrlWifiOnRes *) voidPrimitivePointer; 794 CsrWifiRouterCtrlWifiOnRes *primitive = (CsrWifiRouterCtrlWifiOnRes *) voidPrimitivePointer;
794 CsrPmemFree(primitive->smeVersions.smeBuild); 795 kfree(primitive->smeVersions.smeBuild);
795 CsrPmemFree(primitive); 796 kfree(primitive);
796} 797}
797 798
798 799
@@ -1185,9 +1186,9 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length)
1185void CsrWifiRouterCtrlWapiRxPktReqSerFree(void *voidPrimitivePointer) 1186void CsrWifiRouterCtrlWapiRxPktReqSerFree(void *voidPrimitivePointer)
1186{ 1187{
1187 CsrWifiRouterCtrlWapiRxPktReq *primitive = (CsrWifiRouterCtrlWapiRxPktReq *) voidPrimitivePointer; 1188 CsrWifiRouterCtrlWapiRxPktReq *primitive = (CsrWifiRouterCtrlWapiRxPktReq *) voidPrimitivePointer;
1188 CsrPmemFree(primitive->signal); 1189 kfree(primitive->signal);
1189 CsrPmemFree(primitive->data); 1190 kfree(primitive->data);
1190 CsrPmemFree(primitive); 1191 kfree(primitive);
1191} 1192}
1192 1193
1193 1194
@@ -1245,8 +1246,8 @@ void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length)
1245void CsrWifiRouterCtrlWapiUnicastTxPktReqSerFree(void *voidPrimitivePointer) 1246void CsrWifiRouterCtrlWapiUnicastTxPktReqSerFree(void *voidPrimitivePointer)
1246{ 1247{
1247 CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) voidPrimitivePointer; 1248 CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) voidPrimitivePointer;
1248 CsrPmemFree(primitive->data); 1249 kfree(primitive->data);
1249 CsrPmemFree(primitive); 1250 kfree(primitive);
1250} 1251}
1251 1252
1252 1253
@@ -1335,10 +1336,10 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length)
1335void CsrWifiRouterCtrlHipIndSerFree(void *voidPrimitivePointer) 1336void CsrWifiRouterCtrlHipIndSerFree(void *voidPrimitivePointer)
1336{ 1337{
1337 CsrWifiRouterCtrlHipInd *primitive = (CsrWifiRouterCtrlHipInd *) voidPrimitivePointer; 1338 CsrWifiRouterCtrlHipInd *primitive = (CsrWifiRouterCtrlHipInd *) voidPrimitivePointer;
1338 CsrPmemFree(primitive->mlmeCommand); 1339 kfree(primitive->mlmeCommand);
1339 CsrPmemFree(primitive->dataRef1); 1340 kfree(primitive->dataRef1);
1340 CsrPmemFree(primitive->dataRef2); 1341 kfree(primitive->dataRef2);
1341 CsrPmemFree(primitive); 1342 kfree(primitive);
1342} 1343}
1343 1344
1344 1345
@@ -1414,8 +1415,8 @@ void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length)
1414void CsrWifiRouterCtrlMulticastAddressIndSerFree(void *voidPrimitivePointer) 1415void CsrWifiRouterCtrlMulticastAddressIndSerFree(void *voidPrimitivePointer)
1415{ 1416{
1416 CsrWifiRouterCtrlMulticastAddressInd *primitive = (CsrWifiRouterCtrlMulticastAddressInd *) voidPrimitivePointer; 1417 CsrWifiRouterCtrlMulticastAddressInd *primitive = (CsrWifiRouterCtrlMulticastAddressInd *) voidPrimitivePointer;
1417 CsrPmemFree(primitive->setAddresses); 1418 kfree(primitive->setAddresses);
1418 CsrPmemFree(primitive); 1419 kfree(primitive);
1419} 1420}
1420 1421
1421 1422
@@ -1839,8 +1840,8 @@ void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, size_t length)
1839void CsrWifiRouterCtrlWifiOnIndSerFree(void *voidPrimitivePointer) 1840void CsrWifiRouterCtrlWifiOnIndSerFree(void *voidPrimitivePointer)
1840{ 1841{
1841 CsrWifiRouterCtrlWifiOnInd *primitive = (CsrWifiRouterCtrlWifiOnInd *) voidPrimitivePointer; 1842 CsrWifiRouterCtrlWifiOnInd *primitive = (CsrWifiRouterCtrlWifiOnInd *) voidPrimitivePointer;
1842 CsrPmemFree(primitive->versions.routerBuild); 1843 kfree(primitive->versions.routerBuild);
1843 CsrPmemFree(primitive); 1844 kfree(primitive);
1844} 1845}
1845 1846
1846 1847
@@ -2482,9 +2483,9 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length)
2482void CsrWifiRouterCtrlWapiRxMicCheckIndSerFree(void *voidPrimitivePointer) 2483void CsrWifiRouterCtrlWapiRxMicCheckIndSerFree(void *voidPrimitivePointer)
2483{ 2484{
2484 CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = (CsrWifiRouterCtrlWapiRxMicCheckInd *) voidPrimitivePointer; 2485 CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = (CsrWifiRouterCtrlWapiRxMicCheckInd *) voidPrimitivePointer;
2485 CsrPmemFree(primitive->signal); 2486 kfree(primitive->signal);
2486 CsrPmemFree(primitive->data); 2487 kfree(primitive->data);
2487 CsrPmemFree(primitive); 2488 kfree(primitive);
2488} 2489}
2489 2490
2490 2491
@@ -2587,8 +2588,8 @@ void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length)
2587void CsrWifiRouterCtrlWapiUnicastTxEncryptIndSerFree(void *voidPrimitivePointer) 2588void CsrWifiRouterCtrlWapiUnicastTxEncryptIndSerFree(void *voidPrimitivePointer)
2588{ 2589{
2589 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) voidPrimitivePointer; 2590 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) voidPrimitivePointer;
2590 CsrPmemFree(primitive->data); 2591 kfree(primitive->data);
2591 CsrPmemFree(primitive); 2592 kfree(primitive);
2592} 2593}
2593 2594
2594 2595
diff --git a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
index 24d4ae209908..fbd5b35551c2 100644
--- a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_router_prim.h" 14#include "csr_wifi_router_prim.h"
15#include "csr_wifi_router_lib.h" 15#include "csr_wifi_router_lib.h"
@@ -41,7 +41,7 @@ void CsrWifiRouterFreeDownstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_ROUTER_MA_PACKET_REQ: 41 case CSR_WIFI_ROUTER_MA_PACKET_REQ:
42 { 42 {
43 CsrWifiRouterMaPacketReq *p = (CsrWifiRouterMaPacketReq *)message; 43 CsrWifiRouterMaPacketReq *p = (CsrWifiRouterMaPacketReq *)message;
44 CsrPmemFree(p->frame); 44 kfree(p->frame);
45 p->frame = NULL; 45 p->frame = NULL;
46 break; 46 break;
47 } 47 }
diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
index 2faaaace9dab..60f6ecd4472e 100644
--- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_router_prim.h" 14#include "csr_wifi_router_prim.h"
15#include "csr_wifi_router_lib.h" 15#include "csr_wifi_router_lib.h"
@@ -41,7 +41,7 @@ void CsrWifiRouterFreeUpstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_ROUTER_MA_PACKET_IND: 41 case CSR_WIFI_ROUTER_MA_PACKET_IND:
42 { 42 {
43 CsrWifiRouterMaPacketInd *p = (CsrWifiRouterMaPacketInd *)message; 43 CsrWifiRouterMaPacketInd *p = (CsrWifiRouterMaPacketInd *)message;
44 CsrPmemFree(p->frame); 44 kfree(p->frame);
45 p->frame = NULL; 45 p->frame = NULL;
46 break; 46 break;
47 } 47 }
diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c
index f8447c8e231f..dd2c2cee5de1 100644
--- a/drivers/staging/csr/csr_wifi_router_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_serialize.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_msgconv.h" 14#include "csr_msgconv.h"
15#include "csr_unicode.h" 15#include "csr_unicode.h"
@@ -20,7 +20,7 @@
20 20
21void CsrWifiRouterPfree(void *ptr) 21void CsrWifiRouterPfree(void *ptr)
22{ 22{
23 CsrPmemFree(ptr); 23 kfree(ptr);
24} 24}
25 25
26 26
@@ -136,8 +136,8 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length)
136void CsrWifiRouterMaPacketReqSerFree(void *voidPrimitivePointer) 136void CsrWifiRouterMaPacketReqSerFree(void *voidPrimitivePointer)
137{ 137{
138 CsrWifiRouterMaPacketReq *primitive = (CsrWifiRouterMaPacketReq *) voidPrimitivePointer; 138 CsrWifiRouterMaPacketReq *primitive = (CsrWifiRouterMaPacketReq *) voidPrimitivePointer;
139 CsrPmemFree(primitive->frame); 139 kfree(primitive->frame);
140 CsrPmemFree(primitive); 140 kfree(primitive);
141} 141}
142 142
143 143
@@ -415,8 +415,8 @@ void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length)
415void CsrWifiRouterMaPacketIndSerFree(void *voidPrimitivePointer) 415void CsrWifiRouterMaPacketIndSerFree(void *voidPrimitivePointer)
416{ 416{
417 CsrWifiRouterMaPacketInd *primitive = (CsrWifiRouterMaPacketInd *) voidPrimitivePointer; 417 CsrWifiRouterMaPacketInd *primitive = (CsrWifiRouterMaPacketInd *) voidPrimitivePointer;
418 CsrPmemFree(primitive->frame); 418 kfree(primitive->frame);
419 CsrPmemFree(primitive); 419 kfree(primitive);
420} 420}
421 421
422 422
diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c
index f340780a27af..5d86aa88a40d 100644
--- a/drivers/staging/csr/csr_wifi_router_transport.c
+++ b/drivers/staging/csr/csr_wifi_router_transport.c
@@ -155,7 +155,7 @@ void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, size_t bufferLen
155 unifi_error(priv, "CsrWifiRouterTransportDeserialiseAndSend unhandled prim type 0x%.4X\n", primType); 155 unifi_error(priv, "CsrWifiRouterTransportDeserialiseAndSend unhandled prim type 0x%.4X\n", primType);
156 break; 156 break;
157 } 157 }
158 CsrPmemFree(msg); 158 kfree(msg);
159} 159}
160 160
161static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg) 161static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg)
@@ -193,7 +193,7 @@ static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg)
193 uf_sme_queue_message(drvpriv, encodeBuffer, encodeBufferLen); 193 uf_sme_queue_message(drvpriv, encodeBuffer, encodeBufferLen);
194 194
195 /* Do not use msgEntry->freeFunc because the memory is owned by the driver */ 195 /* Do not use msgEntry->freeFunc because the memory is owned by the driver */
196 CsrPmemFree(msg); 196 kfree(msg);
197} 197}
198 198
199#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) 199#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
diff --git a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
index 826ef3a9b828..ae3fec896aaf 100644
--- a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_sme_prim.h" 14#include "csr_wifi_sme_prim.h"
15#include "csr_wifi_sme_lib.h" 15#include "csr_wifi_sme_lib.h"
@@ -41,90 +41,90 @@ void CsrWifiSmeFreeDownstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_SME_BLACKLIST_REQ: 41 case CSR_WIFI_SME_BLACKLIST_REQ:
42 { 42 {
43 CsrWifiSmeBlacklistReq *p = (CsrWifiSmeBlacklistReq *)message; 43 CsrWifiSmeBlacklistReq *p = (CsrWifiSmeBlacklistReq *)message;
44 CsrPmemFree(p->setAddresses); 44 kfree(p->setAddresses);
45 p->setAddresses = NULL; 45 p->setAddresses = NULL;
46 break; 46 break;
47 } 47 }
48 case CSR_WIFI_SME_CALIBRATION_DATA_SET_REQ: 48 case CSR_WIFI_SME_CALIBRATION_DATA_SET_REQ:
49 { 49 {
50 CsrWifiSmeCalibrationDataSetReq *p = (CsrWifiSmeCalibrationDataSetReq *)message; 50 CsrWifiSmeCalibrationDataSetReq *p = (CsrWifiSmeCalibrationDataSetReq *)message;
51 CsrPmemFree(p->calibrationData); 51 kfree(p->calibrationData);
52 p->calibrationData = NULL; 52 p->calibrationData = NULL;
53 break; 53 break;
54 } 54 }
55 case CSR_WIFI_SME_CONNECT_REQ: 55 case CSR_WIFI_SME_CONNECT_REQ:
56 { 56 {
57 CsrWifiSmeConnectReq *p = (CsrWifiSmeConnectReq *)message; 57 CsrWifiSmeConnectReq *p = (CsrWifiSmeConnectReq *)message;
58 CsrPmemFree(p->connectionConfig.mlmeAssociateReqInformationElements); 58 kfree(p->connectionConfig.mlmeAssociateReqInformationElements);
59 p->connectionConfig.mlmeAssociateReqInformationElements = NULL; 59 p->connectionConfig.mlmeAssociateReqInformationElements = NULL;
60 break; 60 break;
61 } 61 }
62 case CSR_WIFI_SME_MIB_GET_NEXT_REQ: 62 case CSR_WIFI_SME_MIB_GET_NEXT_REQ:
63 { 63 {
64 CsrWifiSmeMibGetNextReq *p = (CsrWifiSmeMibGetNextReq *)message; 64 CsrWifiSmeMibGetNextReq *p = (CsrWifiSmeMibGetNextReq *)message;
65 CsrPmemFree(p->mibAttribute); 65 kfree(p->mibAttribute);
66 p->mibAttribute = NULL; 66 p->mibAttribute = NULL;
67 break; 67 break;
68 } 68 }
69 case CSR_WIFI_SME_MIB_GET_REQ: 69 case CSR_WIFI_SME_MIB_GET_REQ:
70 { 70 {
71 CsrWifiSmeMibGetReq *p = (CsrWifiSmeMibGetReq *)message; 71 CsrWifiSmeMibGetReq *p = (CsrWifiSmeMibGetReq *)message;
72 CsrPmemFree(p->mibAttribute); 72 kfree(p->mibAttribute);
73 p->mibAttribute = NULL; 73 p->mibAttribute = NULL;
74 break; 74 break;
75 } 75 }
76 case CSR_WIFI_SME_MIB_SET_REQ: 76 case CSR_WIFI_SME_MIB_SET_REQ:
77 { 77 {
78 CsrWifiSmeMibSetReq *p = (CsrWifiSmeMibSetReq *)message; 78 CsrWifiSmeMibSetReq *p = (CsrWifiSmeMibSetReq *)message;
79 CsrPmemFree(p->mibAttribute); 79 kfree(p->mibAttribute);
80 p->mibAttribute = NULL; 80 p->mibAttribute = NULL;
81 break; 81 break;
82 } 82 }
83 case CSR_WIFI_SME_MULTICAST_ADDRESS_REQ: 83 case CSR_WIFI_SME_MULTICAST_ADDRESS_REQ:
84 { 84 {
85 CsrWifiSmeMulticastAddressReq *p = (CsrWifiSmeMulticastAddressReq *)message; 85 CsrWifiSmeMulticastAddressReq *p = (CsrWifiSmeMulticastAddressReq *)message;
86 CsrPmemFree(p->setAddresses); 86 kfree(p->setAddresses);
87 p->setAddresses = NULL; 87 p->setAddresses = NULL;
88 break; 88 break;
89 } 89 }
90 case CSR_WIFI_SME_PACKET_FILTER_SET_REQ: 90 case CSR_WIFI_SME_PACKET_FILTER_SET_REQ:
91 { 91 {
92 CsrWifiSmePacketFilterSetReq *p = (CsrWifiSmePacketFilterSetReq *)message; 92 CsrWifiSmePacketFilterSetReq *p = (CsrWifiSmePacketFilterSetReq *)message;
93 CsrPmemFree(p->filter); 93 kfree(p->filter);
94 p->filter = NULL; 94 p->filter = NULL;
95 break; 95 break;
96 } 96 }
97 case CSR_WIFI_SME_PMKID_REQ: 97 case CSR_WIFI_SME_PMKID_REQ:
98 { 98 {
99 CsrWifiSmePmkidReq *p = (CsrWifiSmePmkidReq *)message; 99 CsrWifiSmePmkidReq *p = (CsrWifiSmePmkidReq *)message;
100 CsrPmemFree(p->setPmkids); 100 kfree(p->setPmkids);
101 p->setPmkids = NULL; 101 p->setPmkids = NULL;
102 break; 102 break;
103 } 103 }
104 case CSR_WIFI_SME_SCAN_CONFIG_SET_REQ: 104 case CSR_WIFI_SME_SCAN_CONFIG_SET_REQ:
105 { 105 {
106 CsrWifiSmeScanConfigSetReq *p = (CsrWifiSmeScanConfigSetReq *)message; 106 CsrWifiSmeScanConfigSetReq *p = (CsrWifiSmeScanConfigSetReq *)message;
107 CsrPmemFree(p->scanConfig.passiveChannelList); 107 kfree(p->scanConfig.passiveChannelList);
108 p->scanConfig.passiveChannelList = NULL; 108 p->scanConfig.passiveChannelList = NULL;
109 break; 109 break;
110 } 110 }
111 case CSR_WIFI_SME_SCAN_FULL_REQ: 111 case CSR_WIFI_SME_SCAN_FULL_REQ:
112 { 112 {
113 CsrWifiSmeScanFullReq *p = (CsrWifiSmeScanFullReq *)message; 113 CsrWifiSmeScanFullReq *p = (CsrWifiSmeScanFullReq *)message;
114 CsrPmemFree(p->ssid); 114 kfree(p->ssid);
115 p->ssid = NULL; 115 p->ssid = NULL;
116 CsrPmemFree(p->channelList); 116 kfree(p->channelList);
117 p->channelList = NULL; 117 p->channelList = NULL;
118 CsrPmemFree(p->probeIe); 118 kfree(p->probeIe);
119 p->probeIe = NULL; 119 p->probeIe = NULL;
120 break; 120 break;
121 } 121 }
122 case CSR_WIFI_SME_TSPEC_REQ: 122 case CSR_WIFI_SME_TSPEC_REQ:
123 { 123 {
124 CsrWifiSmeTspecReq *p = (CsrWifiSmeTspecReq *)message; 124 CsrWifiSmeTspecReq *p = (CsrWifiSmeTspecReq *)message;
125 CsrPmemFree(p->tspec); 125 kfree(p->tspec);
126 p->tspec = NULL; 126 p->tspec = NULL;
127 CsrPmemFree(p->tclas); 127 kfree(p->tclas);
128 p->tclas = NULL; 128 p->tclas = NULL;
129 break; 129 break;
130 } 130 }
@@ -135,11 +135,11 @@ void CsrWifiSmeFreeDownstreamMessageContents(u16 eventClass, void *message)
135 u16 i1; 135 u16 i1;
136 for (i1 = 0; i1 < p->mibFilesCount; i1++) 136 for (i1 = 0; i1 < p->mibFilesCount; i1++)
137 { 137 {
138 CsrPmemFree(p->mibFiles[i1].data); 138 kfree(p->mibFiles[i1].data);
139 p->mibFiles[i1].data = NULL; 139 p->mibFiles[i1].data = NULL;
140 } 140 }
141 } 141 }
142 CsrPmemFree(p->mibFiles); 142 kfree(p->mibFiles);
143 p->mibFiles = NULL; 143 p->mibFiles = NULL;
144 break; 144 break;
145 } 145 }
@@ -150,32 +150,32 @@ void CsrWifiSmeFreeDownstreamMessageContents(u16 eventClass, void *message)
150 u16 i1; 150 u16 i1;
151 for (i1 = 0; i1 < p->mibFilesCount; i1++) 151 for (i1 = 0; i1 < p->mibFilesCount; i1++)
152 { 152 {
153 CsrPmemFree(p->mibFiles[i1].data); 153 kfree(p->mibFiles[i1].data);
154 p->mibFiles[i1].data = NULL; 154 p->mibFiles[i1].data = NULL;
155 } 155 }
156 } 156 }
157 CsrPmemFree(p->mibFiles); 157 kfree(p->mibFiles);
158 p->mibFiles = NULL; 158 p->mibFiles = NULL;
159 break; 159 break;
160 } 160 }
161 case CSR_WIFI_SME_CLOAKED_SSIDS_SET_REQ: 161 case CSR_WIFI_SME_CLOAKED_SSIDS_SET_REQ:
162 { 162 {
163 CsrWifiSmeCloakedSsidsSetReq *p = (CsrWifiSmeCloakedSsidsSetReq *)message; 163 CsrWifiSmeCloakedSsidsSetReq *p = (CsrWifiSmeCloakedSsidsSetReq *)message;
164 CsrPmemFree(p->cloakedSsids.cloakedSsids); 164 kfree(p->cloakedSsids.cloakedSsids);
165 p->cloakedSsids.cloakedSsids = NULL; 165 p->cloakedSsids.cloakedSsids = NULL;
166 break; 166 break;
167 } 167 }
168 case CSR_WIFI_SME_WPS_CONFIGURATION_REQ: 168 case CSR_WIFI_SME_WPS_CONFIGURATION_REQ:
169 { 169 {
170 CsrWifiSmeWpsConfigurationReq *p = (CsrWifiSmeWpsConfigurationReq *)message; 170 CsrWifiSmeWpsConfigurationReq *p = (CsrWifiSmeWpsConfigurationReq *)message;
171 CsrPmemFree(p->wpsConfig.secondaryDeviceType); 171 kfree(p->wpsConfig.secondaryDeviceType);
172 p->wpsConfig.secondaryDeviceType = NULL; 172 p->wpsConfig.secondaryDeviceType = NULL;
173 break; 173 break;
174 } 174 }
175 case CSR_WIFI_SME_SET_REQ: 175 case CSR_WIFI_SME_SET_REQ:
176 { 176 {
177 CsrWifiSmeSetReq *p = (CsrWifiSmeSetReq *)message; 177 CsrWifiSmeSetReq *p = (CsrWifiSmeSetReq *)message;
178 CsrPmemFree(p->data); 178 kfree(p->data);
179 p->data = NULL; 179 p->data = NULL;
180 break; 180 break;
181 } 181 }
diff --git a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
index c34b57e960dd..1977747a51d1 100644
--- a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
@@ -9,7 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12 12#include <linux/slab.h>
13#include "csr_pmem.h" 13#include "csr_pmem.h"
14#include "csr_wifi_sme_prim.h" 14#include "csr_wifi_sme_prim.h"
15#include "csr_wifi_sme_lib.h" 15#include "csr_wifi_sme_lib.h"
@@ -41,121 +41,121 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
41 case CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND: 41 case CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND:
42 { 42 {
43 CsrWifiSmeAssociationCompleteInd *p = (CsrWifiSmeAssociationCompleteInd *)message; 43 CsrWifiSmeAssociationCompleteInd *p = (CsrWifiSmeAssociationCompleteInd *)message;
44 CsrPmemFree(p->connectionInfo.beaconFrame); 44 kfree(p->connectionInfo.beaconFrame);
45 p->connectionInfo.beaconFrame = NULL; 45 p->connectionInfo.beaconFrame = NULL;
46 CsrPmemFree(p->connectionInfo.associationReqFrame); 46 kfree(p->connectionInfo.associationReqFrame);
47 p->connectionInfo.associationReqFrame = NULL; 47 p->connectionInfo.associationReqFrame = NULL;
48 CsrPmemFree(p->connectionInfo.associationRspFrame); 48 kfree(p->connectionInfo.associationRspFrame);
49 p->connectionInfo.associationRspFrame = NULL; 49 p->connectionInfo.associationRspFrame = NULL;
50 CsrPmemFree(p->connectionInfo.assocScanInfoElements); 50 kfree(p->connectionInfo.assocScanInfoElements);
51 p->connectionInfo.assocScanInfoElements = NULL; 51 p->connectionInfo.assocScanInfoElements = NULL;
52 CsrPmemFree(p->connectionInfo.assocReqInfoElements); 52 kfree(p->connectionInfo.assocReqInfoElements);
53 p->connectionInfo.assocReqInfoElements = NULL; 53 p->connectionInfo.assocReqInfoElements = NULL;
54 CsrPmemFree(p->connectionInfo.assocRspInfoElements); 54 kfree(p->connectionInfo.assocRspInfoElements);
55 p->connectionInfo.assocRspInfoElements = NULL; 55 p->connectionInfo.assocRspInfoElements = NULL;
56 break; 56 break;
57 } 57 }
58 case CSR_WIFI_SME_BLACKLIST_CFM: 58 case CSR_WIFI_SME_BLACKLIST_CFM:
59 { 59 {
60 CsrWifiSmeBlacklistCfm *p = (CsrWifiSmeBlacklistCfm *)message; 60 CsrWifiSmeBlacklistCfm *p = (CsrWifiSmeBlacklistCfm *)message;
61 CsrPmemFree(p->getAddresses); 61 kfree(p->getAddresses);
62 p->getAddresses = NULL; 62 p->getAddresses = NULL;
63 break; 63 break;
64 } 64 }
65 case CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM: 65 case CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM:
66 { 66 {
67 CsrWifiSmeCalibrationDataGetCfm *p = (CsrWifiSmeCalibrationDataGetCfm *)message; 67 CsrWifiSmeCalibrationDataGetCfm *p = (CsrWifiSmeCalibrationDataGetCfm *)message;
68 CsrPmemFree(p->calibrationData); 68 kfree(p->calibrationData);
69 p->calibrationData = NULL; 69 p->calibrationData = NULL;
70 break; 70 break;
71 } 71 }
72 case CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM: 72 case CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM:
73 { 73 {
74 CsrWifiSmeConnectionConfigGetCfm *p = (CsrWifiSmeConnectionConfigGetCfm *)message; 74 CsrWifiSmeConnectionConfigGetCfm *p = (CsrWifiSmeConnectionConfigGetCfm *)message;
75 CsrPmemFree(p->connectionConfig.mlmeAssociateReqInformationElements); 75 kfree(p->connectionConfig.mlmeAssociateReqInformationElements);
76 p->connectionConfig.mlmeAssociateReqInformationElements = NULL; 76 p->connectionConfig.mlmeAssociateReqInformationElements = NULL;
77 break; 77 break;
78 } 78 }
79 case CSR_WIFI_SME_CONNECTION_INFO_GET_CFM: 79 case CSR_WIFI_SME_CONNECTION_INFO_GET_CFM:
80 { 80 {
81 CsrWifiSmeConnectionInfoGetCfm *p = (CsrWifiSmeConnectionInfoGetCfm *)message; 81 CsrWifiSmeConnectionInfoGetCfm *p = (CsrWifiSmeConnectionInfoGetCfm *)message;
82 CsrPmemFree(p->connectionInfo.beaconFrame); 82 kfree(p->connectionInfo.beaconFrame);
83 p->connectionInfo.beaconFrame = NULL; 83 p->connectionInfo.beaconFrame = NULL;
84 CsrPmemFree(p->connectionInfo.associationReqFrame); 84 kfree(p->connectionInfo.associationReqFrame);
85 p->connectionInfo.associationReqFrame = NULL; 85 p->connectionInfo.associationReqFrame = NULL;
86 CsrPmemFree(p->connectionInfo.associationRspFrame); 86 kfree(p->connectionInfo.associationRspFrame);
87 p->connectionInfo.associationRspFrame = NULL; 87 p->connectionInfo.associationRspFrame = NULL;
88 CsrPmemFree(p->connectionInfo.assocScanInfoElements); 88 kfree(p->connectionInfo.assocScanInfoElements);
89 p->connectionInfo.assocScanInfoElements = NULL; 89 p->connectionInfo.assocScanInfoElements = NULL;
90 CsrPmemFree(p->connectionInfo.assocReqInfoElements); 90 kfree(p->connectionInfo.assocReqInfoElements);
91 p->connectionInfo.assocReqInfoElements = NULL; 91 p->connectionInfo.assocReqInfoElements = NULL;
92 CsrPmemFree(p->connectionInfo.assocRspInfoElements); 92 kfree(p->connectionInfo.assocRspInfoElements);
93 p->connectionInfo.assocRspInfoElements = NULL; 93 p->connectionInfo.assocRspInfoElements = NULL;
94 break; 94 break;
95 } 95 }
96 case CSR_WIFI_SME_MEDIA_STATUS_IND: 96 case CSR_WIFI_SME_MEDIA_STATUS_IND:
97 { 97 {
98 CsrWifiSmeMediaStatusInd *p = (CsrWifiSmeMediaStatusInd *)message; 98 CsrWifiSmeMediaStatusInd *p = (CsrWifiSmeMediaStatusInd *)message;
99 CsrPmemFree(p->connectionInfo.beaconFrame); 99 kfree(p->connectionInfo.beaconFrame);
100 p->connectionInfo.beaconFrame = NULL; 100 p->connectionInfo.beaconFrame = NULL;
101 CsrPmemFree(p->connectionInfo.associationReqFrame); 101 kfree(p->connectionInfo.associationReqFrame);
102 p->connectionInfo.associationReqFrame = NULL; 102 p->connectionInfo.associationReqFrame = NULL;
103 CsrPmemFree(p->connectionInfo.associationRspFrame); 103 kfree(p->connectionInfo.associationRspFrame);
104 p->connectionInfo.associationRspFrame = NULL; 104 p->connectionInfo.associationRspFrame = NULL;
105 CsrPmemFree(p->connectionInfo.assocScanInfoElements); 105 kfree(p->connectionInfo.assocScanInfoElements);
106 p->connectionInfo.assocScanInfoElements = NULL; 106 p->connectionInfo.assocScanInfoElements = NULL;
107 CsrPmemFree(p->connectionInfo.assocReqInfoElements); 107 kfree(p->connectionInfo.assocReqInfoElements);
108 p->connectionInfo.assocReqInfoElements = NULL; 108 p->connectionInfo.assocReqInfoElements = NULL;
109 CsrPmemFree(p->connectionInfo.assocRspInfoElements); 109 kfree(p->connectionInfo.assocRspInfoElements);
110 p->connectionInfo.assocRspInfoElements = NULL; 110 p->connectionInfo.assocRspInfoElements = NULL;
111 break; 111 break;
112 } 112 }
113 case CSR_WIFI_SME_MIB_GET_CFM: 113 case CSR_WIFI_SME_MIB_GET_CFM:
114 { 114 {
115 CsrWifiSmeMibGetCfm *p = (CsrWifiSmeMibGetCfm *)message; 115 CsrWifiSmeMibGetCfm *p = (CsrWifiSmeMibGetCfm *)message;
116 CsrPmemFree(p->mibAttribute); 116 kfree(p->mibAttribute);
117 p->mibAttribute = NULL; 117 p->mibAttribute = NULL;
118 break; 118 break;
119 } 119 }
120 case CSR_WIFI_SME_MIB_GET_NEXT_CFM: 120 case CSR_WIFI_SME_MIB_GET_NEXT_CFM:
121 { 121 {
122 CsrWifiSmeMibGetNextCfm *p = (CsrWifiSmeMibGetNextCfm *)message; 122 CsrWifiSmeMibGetNextCfm *p = (CsrWifiSmeMibGetNextCfm *)message;
123 CsrPmemFree(p->mibAttribute); 123 kfree(p->mibAttribute);
124 p->mibAttribute = NULL; 124 p->mibAttribute = NULL;
125 break; 125 break;
126 } 126 }
127 case CSR_WIFI_SME_MULTICAST_ADDRESS_CFM: 127 case CSR_WIFI_SME_MULTICAST_ADDRESS_CFM:
128 { 128 {
129 CsrWifiSmeMulticastAddressCfm *p = (CsrWifiSmeMulticastAddressCfm *)message; 129 CsrWifiSmeMulticastAddressCfm *p = (CsrWifiSmeMulticastAddressCfm *)message;
130 CsrPmemFree(p->getAddresses); 130 kfree(p->getAddresses);
131 p->getAddresses = NULL; 131 p->getAddresses = NULL;
132 break; 132 break;
133 } 133 }
134 case CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND: 134 case CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND:
135 { 135 {
136 CsrWifiSmePmkidCandidateListInd *p = (CsrWifiSmePmkidCandidateListInd *)message; 136 CsrWifiSmePmkidCandidateListInd *p = (CsrWifiSmePmkidCandidateListInd *)message;
137 CsrPmemFree(p->pmkidCandidates); 137 kfree(p->pmkidCandidates);
138 p->pmkidCandidates = NULL; 138 p->pmkidCandidates = NULL;
139 break; 139 break;
140 } 140 }
141 case CSR_WIFI_SME_PMKID_CFM: 141 case CSR_WIFI_SME_PMKID_CFM:
142 { 142 {
143 CsrWifiSmePmkidCfm *p = (CsrWifiSmePmkidCfm *)message; 143 CsrWifiSmePmkidCfm *p = (CsrWifiSmePmkidCfm *)message;
144 CsrPmemFree(p->getPmkids); 144 kfree(p->getPmkids);
145 p->getPmkids = NULL; 145 p->getPmkids = NULL;
146 break; 146 break;
147 } 147 }
148 case CSR_WIFI_SME_SCAN_CONFIG_GET_CFM: 148 case CSR_WIFI_SME_SCAN_CONFIG_GET_CFM:
149 { 149 {
150 CsrWifiSmeScanConfigGetCfm *p = (CsrWifiSmeScanConfigGetCfm *)message; 150 CsrWifiSmeScanConfigGetCfm *p = (CsrWifiSmeScanConfigGetCfm *)message;
151 CsrPmemFree(p->scanConfig.passiveChannelList); 151 kfree(p->scanConfig.passiveChannelList);
152 p->scanConfig.passiveChannelList = NULL; 152 p->scanConfig.passiveChannelList = NULL;
153 break; 153 break;
154 } 154 }
155 case CSR_WIFI_SME_SCAN_RESULT_IND: 155 case CSR_WIFI_SME_SCAN_RESULT_IND:
156 { 156 {
157 CsrWifiSmeScanResultInd *p = (CsrWifiSmeScanResultInd *)message; 157 CsrWifiSmeScanResultInd *p = (CsrWifiSmeScanResultInd *)message;
158 CsrPmemFree(p->result.informationElements); 158 kfree(p->result.informationElements);
159 p->result.informationElements = NULL; 159 p->result.informationElements = NULL;
160 switch (p->result.p2pDeviceRole) 160 switch (p->result.p2pDeviceRole)
161 { 161 {
@@ -164,15 +164,15 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
164 u16 i4; 164 u16 i4;
165 for (i4 = 0; i4 < p->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) 165 for (i4 = 0; i4 < p->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++)
166 { 166 {
167 CsrPmemFree(p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); 167 kfree(p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
168 p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; 168 p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
169 } 169 }
170 } 170 }
171 CsrPmemFree(p->result.deviceInfo.groupInfo.p2PClientInfo); 171 kfree(p->result.deviceInfo.groupInfo.p2PClientInfo);
172 p->result.deviceInfo.groupInfo.p2PClientInfo = NULL; 172 p->result.deviceInfo.groupInfo.p2PClientInfo = NULL;
173 break; 173 break;
174 case CSR_WIFI_SME_P2P_ROLE_STANDALONE: 174 case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
175 CsrPmemFree(p->result.deviceInfo.standalonedevInfo.secDeviceType); 175 kfree(p->result.deviceInfo.standalonedevInfo.secDeviceType);
176 p->result.deviceInfo.standalonedevInfo.secDeviceType = NULL; 176 p->result.deviceInfo.standalonedevInfo.secDeviceType = NULL;
177 break; 177 break;
178 default: 178 default:
@@ -187,7 +187,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
187 u16 i1; 187 u16 i1;
188 for (i1 = 0; i1 < p->scanResultsCount; i1++) 188 for (i1 = 0; i1 < p->scanResultsCount; i1++)
189 { 189 {
190 CsrPmemFree(p->scanResults[i1].informationElements); 190 kfree(p->scanResults[i1].informationElements);
191 p->scanResults[i1].informationElements = NULL; 191 p->scanResults[i1].informationElements = NULL;
192 switch (p->scanResults[i1].p2pDeviceRole) 192 switch (p->scanResults[i1].p2pDeviceRole)
193 { 193 {
@@ -196,15 +196,15 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
196 u16 i4; 196 u16 i4;
197 for (i4 = 0; i4 < p->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) 197 for (i4 = 0; i4 < p->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++)
198 { 198 {
199 CsrPmemFree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); 199 kfree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
200 p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; 200 p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
201 } 201 }
202 } 202 }
203 CsrPmemFree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo); 203 kfree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo);
204 p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL; 204 p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL;
205 break; 205 break;
206 case CSR_WIFI_SME_P2P_ROLE_STANDALONE: 206 case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
207 CsrPmemFree(p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType); 207 kfree(p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType);
208 p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL; 208 p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL;
209 break; 209 break;
210 default: 210 default:
@@ -212,58 +212,58 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
212 } 212 }
213 } 213 }
214 } 214 }
215 CsrPmemFree(p->scanResults); 215 kfree(p->scanResults);
216 p->scanResults = NULL; 216 p->scanResults = NULL;
217 break; 217 break;
218 } 218 }
219 case CSR_WIFI_SME_TSPEC_IND: 219 case CSR_WIFI_SME_TSPEC_IND:
220 { 220 {
221 CsrWifiSmeTspecInd *p = (CsrWifiSmeTspecInd *)message; 221 CsrWifiSmeTspecInd *p = (CsrWifiSmeTspecInd *)message;
222 CsrPmemFree(p->tspec); 222 kfree(p->tspec);
223 p->tspec = NULL; 223 p->tspec = NULL;
224 break; 224 break;
225 } 225 }
226 case CSR_WIFI_SME_TSPEC_CFM: 226 case CSR_WIFI_SME_TSPEC_CFM:
227 { 227 {
228 CsrWifiSmeTspecCfm *p = (CsrWifiSmeTspecCfm *)message; 228 CsrWifiSmeTspecCfm *p = (CsrWifiSmeTspecCfm *)message;
229 CsrPmemFree(p->tspec); 229 kfree(p->tspec);
230 p->tspec = NULL; 230 p->tspec = NULL;
231 break; 231 break;
232 } 232 }
233 case CSR_WIFI_SME_VERSIONS_GET_CFM: 233 case CSR_WIFI_SME_VERSIONS_GET_CFM:
234 { 234 {
235 CsrWifiSmeVersionsGetCfm *p = (CsrWifiSmeVersionsGetCfm *)message; 235 CsrWifiSmeVersionsGetCfm *p = (CsrWifiSmeVersionsGetCfm *)message;
236 CsrPmemFree(p->versions.routerBuild); 236 kfree(p->versions.routerBuild);
237 p->versions.routerBuild = NULL; 237 p->versions.routerBuild = NULL;
238 CsrPmemFree(p->versions.smeBuild); 238 kfree(p->versions.smeBuild);
239 p->versions.smeBuild = NULL; 239 p->versions.smeBuild = NULL;
240 break; 240 break;
241 } 241 }
242 case CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM: 242 case CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM:
243 { 243 {
244 CsrWifiSmeCloakedSsidsGetCfm *p = (CsrWifiSmeCloakedSsidsGetCfm *)message; 244 CsrWifiSmeCloakedSsidsGetCfm *p = (CsrWifiSmeCloakedSsidsGetCfm *)message;
245 CsrPmemFree(p->cloakedSsids.cloakedSsids); 245 kfree(p->cloakedSsids.cloakedSsids);
246 p->cloakedSsids.cloakedSsids = NULL; 246 p->cloakedSsids.cloakedSsids = NULL;
247 break; 247 break;
248 } 248 }
249 case CSR_WIFI_SME_ERROR_IND: 249 case CSR_WIFI_SME_ERROR_IND:
250 { 250 {
251 CsrWifiSmeErrorInd *p = (CsrWifiSmeErrorInd *)message; 251 CsrWifiSmeErrorInd *p = (CsrWifiSmeErrorInd *)message;
252 CsrPmemFree(p->errorMessage); 252 kfree(p->errorMessage);
253 p->errorMessage = NULL; 253 p->errorMessage = NULL;
254 break; 254 break;
255 } 255 }
256 case CSR_WIFI_SME_INFO_IND: 256 case CSR_WIFI_SME_INFO_IND:
257 { 257 {
258 CsrWifiSmeInfoInd *p = (CsrWifiSmeInfoInd *)message; 258 CsrWifiSmeInfoInd *p = (CsrWifiSmeInfoInd *)message;
259 CsrPmemFree(p->infoMessage); 259 kfree(p->infoMessage);
260 p->infoMessage = NULL; 260 p->infoMessage = NULL;
261 break; 261 break;
262 } 262 }
263 case CSR_WIFI_SME_CORE_DUMP_IND: 263 case CSR_WIFI_SME_CORE_DUMP_IND:
264 { 264 {
265 CsrWifiSmeCoreDumpInd *p = (CsrWifiSmeCoreDumpInd *)message; 265 CsrWifiSmeCoreDumpInd *p = (CsrWifiSmeCoreDumpInd *)message;
266 CsrPmemFree(p->data); 266 kfree(p->data);
267 p->data = NULL; 267 p->data = NULL;
268 break; 268 break;
269 } 269 }
diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c
index 27e969caf1dd..57b4cf060f70 100644
--- a/drivers/staging/csr/csr_wifi_sme_serialize.c
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -10,6 +10,7 @@
10 10
11/* Note: this is an auto-generated file. */ 11/* Note: this is an auto-generated file. */
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/slab.h>
13#include "csr_pmem.h" 14#include "csr_pmem.h"
14#include "csr_msgconv.h" 15#include "csr_msgconv.h"
15#include "csr_unicode.h" 16#include "csr_unicode.h"
@@ -20,7 +21,7 @@
20 21
21void CsrWifiSmePfree(void *ptr) 22void CsrWifiSmePfree(void *ptr)
22{ 23{
23 CsrPmemFree(ptr); 24 kfree(ptr);
24} 25}
25 26
26 27
@@ -135,8 +136,8 @@ void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length)
135void CsrWifiSmeBlacklistReqSerFree(void *voidPrimitivePointer) 136void CsrWifiSmeBlacklistReqSerFree(void *voidPrimitivePointer)
136{ 137{
137 CsrWifiSmeBlacklistReq *primitive = (CsrWifiSmeBlacklistReq *) voidPrimitivePointer; 138 CsrWifiSmeBlacklistReq *primitive = (CsrWifiSmeBlacklistReq *) voidPrimitivePointer;
138 CsrPmemFree(primitive->setAddresses); 139 kfree(primitive->setAddresses);
139 CsrPmemFree(primitive); 140 kfree(primitive);
140} 141}
141 142
142 143
@@ -191,8 +192,8 @@ void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length)
191void CsrWifiSmeCalibrationDataSetReqSerFree(void *voidPrimitivePointer) 192void CsrWifiSmeCalibrationDataSetReqSerFree(void *voidPrimitivePointer)
192{ 193{
193 CsrWifiSmeCalibrationDataSetReq *primitive = (CsrWifiSmeCalibrationDataSetReq *) voidPrimitivePointer; 194 CsrWifiSmeCalibrationDataSetReq *primitive = (CsrWifiSmeCalibrationDataSetReq *) voidPrimitivePointer;
194 CsrPmemFree(primitive->calibrationData); 195 kfree(primitive->calibrationData);
195 CsrPmemFree(primitive); 196 kfree(primitive);
196} 197}
197 198
198 199
@@ -400,8 +401,8 @@ void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length)
400void CsrWifiSmeConnectReqSerFree(void *voidPrimitivePointer) 401void CsrWifiSmeConnectReqSerFree(void *voidPrimitivePointer)
401{ 402{
402 CsrWifiSmeConnectReq *primitive = (CsrWifiSmeConnectReq *) voidPrimitivePointer; 403 CsrWifiSmeConnectReq *primitive = (CsrWifiSmeConnectReq *) voidPrimitivePointer;
403 CsrPmemFree(primitive->connectionConfig.mlmeAssociateReqInformationElements); 404 kfree(primitive->connectionConfig.mlmeAssociateReqInformationElements);
404 CsrPmemFree(primitive); 405 kfree(primitive);
405} 406}
406 407
407 408
@@ -618,8 +619,8 @@ void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length)
618void CsrWifiSmeMibGetNextReqSerFree(void *voidPrimitivePointer) 619void CsrWifiSmeMibGetNextReqSerFree(void *voidPrimitivePointer)
619{ 620{
620 CsrWifiSmeMibGetNextReq *primitive = (CsrWifiSmeMibGetNextReq *) voidPrimitivePointer; 621 CsrWifiSmeMibGetNextReq *primitive = (CsrWifiSmeMibGetNextReq *) voidPrimitivePointer;
621 CsrPmemFree(primitive->mibAttribute); 622 kfree(primitive->mibAttribute);
622 CsrPmemFree(primitive); 623 kfree(primitive);
623} 624}
624 625
625 626
@@ -674,8 +675,8 @@ void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length)
674void CsrWifiSmeMibGetReqSerFree(void *voidPrimitivePointer) 675void CsrWifiSmeMibGetReqSerFree(void *voidPrimitivePointer)
675{ 676{
676 CsrWifiSmeMibGetReq *primitive = (CsrWifiSmeMibGetReq *) voidPrimitivePointer; 677 CsrWifiSmeMibGetReq *primitive = (CsrWifiSmeMibGetReq *) voidPrimitivePointer;
677 CsrPmemFree(primitive->mibAttribute); 678 kfree(primitive->mibAttribute);
678 CsrPmemFree(primitive); 679 kfree(primitive);
679} 680}
680 681
681 682
@@ -730,8 +731,8 @@ void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length)
730void CsrWifiSmeMibSetReqSerFree(void *voidPrimitivePointer) 731void CsrWifiSmeMibSetReqSerFree(void *voidPrimitivePointer)
731{ 732{
732 CsrWifiSmeMibSetReq *primitive = (CsrWifiSmeMibSetReq *) voidPrimitivePointer; 733 CsrWifiSmeMibSetReq *primitive = (CsrWifiSmeMibSetReq *) voidPrimitivePointer;
733 CsrPmemFree(primitive->mibAttribute); 734 kfree(primitive->mibAttribute);
734 CsrPmemFree(primitive); 735 kfree(primitive);
735} 736}
736 737
737 738
@@ -804,8 +805,8 @@ void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length)
804void CsrWifiSmeMulticastAddressReqSerFree(void *voidPrimitivePointer) 805void CsrWifiSmeMulticastAddressReqSerFree(void *voidPrimitivePointer)
805{ 806{
806 CsrWifiSmeMulticastAddressReq *primitive = (CsrWifiSmeMulticastAddressReq *) voidPrimitivePointer; 807 CsrWifiSmeMulticastAddressReq *primitive = (CsrWifiSmeMulticastAddressReq *) voidPrimitivePointer;
807 CsrPmemFree(primitive->setAddresses); 808 kfree(primitive->setAddresses);
808 CsrPmemFree(primitive); 809 kfree(primitive);
809} 810}
810 811
811 812
@@ -869,8 +870,8 @@ void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length)
869void CsrWifiSmePacketFilterSetReqSerFree(void *voidPrimitivePointer) 870void CsrWifiSmePacketFilterSetReqSerFree(void *voidPrimitivePointer)
870{ 871{
871 CsrWifiSmePacketFilterSetReq *primitive = (CsrWifiSmePacketFilterSetReq *) voidPrimitivePointer; 872 CsrWifiSmePacketFilterSetReq *primitive = (CsrWifiSmePacketFilterSetReq *) voidPrimitivePointer;
872 CsrPmemFree(primitive->filter); 873 kfree(primitive->filter);
873 CsrPmemFree(primitive); 874 kfree(primitive);
874} 875}
875 876
876 877
@@ -946,8 +947,8 @@ void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length)
946void CsrWifiSmePmkidReqSerFree(void *voidPrimitivePointer) 947void CsrWifiSmePmkidReqSerFree(void *voidPrimitivePointer)
947{ 948{
948 CsrWifiSmePmkidReq *primitive = (CsrWifiSmePmkidReq *) voidPrimitivePointer; 949 CsrWifiSmePmkidReq *primitive = (CsrWifiSmePmkidReq *) voidPrimitivePointer;
949 CsrPmemFree(primitive->setPmkids); 950 kfree(primitive->setPmkids);
950 CsrPmemFree(primitive); 951 kfree(primitive);
951} 952}
952 953
953 954
@@ -1224,8 +1225,8 @@ void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length)
1224void CsrWifiSmeScanConfigSetReqSerFree(void *voidPrimitivePointer) 1225void CsrWifiSmeScanConfigSetReqSerFree(void *voidPrimitivePointer)
1225{ 1226{
1226 CsrWifiSmeScanConfigSetReq *primitive = (CsrWifiSmeScanConfigSetReq *) voidPrimitivePointer; 1227 CsrWifiSmeScanConfigSetReq *primitive = (CsrWifiSmeScanConfigSetReq *) voidPrimitivePointer;
1227 CsrPmemFree(primitive->scanConfig.passiveChannelList); 1228 kfree(primitive->scanConfig.passiveChannelList);
1228 CsrPmemFree(primitive); 1229 kfree(primitive);
1229} 1230}
1230 1231
1231 1232
@@ -1341,10 +1342,10 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length)
1341void CsrWifiSmeScanFullReqSerFree(void *voidPrimitivePointer) 1342void CsrWifiSmeScanFullReqSerFree(void *voidPrimitivePointer)
1342{ 1343{
1343 CsrWifiSmeScanFullReq *primitive = (CsrWifiSmeScanFullReq *) voidPrimitivePointer; 1344 CsrWifiSmeScanFullReq *primitive = (CsrWifiSmeScanFullReq *) voidPrimitivePointer;
1344 CsrPmemFree(primitive->ssid); 1345 kfree(primitive->ssid);
1345 CsrPmemFree(primitive->channelList); 1346 kfree(primitive->channelList);
1346 CsrPmemFree(primitive->probeIe); 1347 kfree(primitive->probeIe);
1347 CsrPmemFree(primitive); 1348 kfree(primitive);
1348} 1349}
1349 1350
1350 1351
@@ -1482,9 +1483,9 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length)
1482void CsrWifiSmeTspecReqSerFree(void *voidPrimitivePointer) 1483void CsrWifiSmeTspecReqSerFree(void *voidPrimitivePointer)
1483{ 1484{
1484 CsrWifiSmeTspecReq *primitive = (CsrWifiSmeTspecReq *) voidPrimitivePointer; 1485 CsrWifiSmeTspecReq *primitive = (CsrWifiSmeTspecReq *) voidPrimitivePointer;
1485 CsrPmemFree(primitive->tspec); 1486 kfree(primitive->tspec);
1486 CsrPmemFree(primitive->tclas); 1487 kfree(primitive->tclas);
1487 CsrPmemFree(primitive); 1488 kfree(primitive);
1488} 1489}
1489 1490
1490 1491
@@ -1572,11 +1573,11 @@ void CsrWifiSmeWifiFlightmodeReqSerFree(void *voidPrimitivePointer)
1572 u16 i1; 1573 u16 i1;
1573 for (i1 = 0; i1 < primitive->mibFilesCount; i1++) 1574 for (i1 = 0; i1 < primitive->mibFilesCount; i1++)
1574 { 1575 {
1575 CsrPmemFree(primitive->mibFiles[i1].data); 1576 kfree(primitive->mibFiles[i1].data);
1576 } 1577 }
1577 } 1578 }
1578 CsrPmemFree(primitive->mibFiles); 1579 kfree(primitive->mibFiles);
1579 CsrPmemFree(primitive); 1580 kfree(primitive);
1580} 1581}
1581 1582
1582 1583
@@ -1664,11 +1665,11 @@ void CsrWifiSmeWifiOnReqSerFree(void *voidPrimitivePointer)
1664 u16 i1; 1665 u16 i1;
1665 for (i1 = 0; i1 < primitive->mibFilesCount; i1++) 1666 for (i1 = 0; i1 < primitive->mibFilesCount; i1++)
1666 { 1667 {
1667 CsrPmemFree(primitive->mibFiles[i1].data); 1668 kfree(primitive->mibFiles[i1].data);
1668 } 1669 }
1669 } 1670 }
1670 CsrPmemFree(primitive->mibFiles); 1671 kfree(primitive->mibFiles);
1671 CsrPmemFree(primitive); 1672 kfree(primitive);
1672} 1673}
1673 1674
1674 1675
@@ -1738,8 +1739,8 @@ void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length)
1738void CsrWifiSmeCloakedSsidsSetReqSerFree(void *voidPrimitivePointer) 1739void CsrWifiSmeCloakedSsidsSetReqSerFree(void *voidPrimitivePointer)
1739{ 1740{
1740 CsrWifiSmeCloakedSsidsSetReq *primitive = (CsrWifiSmeCloakedSsidsSetReq *) voidPrimitivePointer; 1741 CsrWifiSmeCloakedSsidsSetReq *primitive = (CsrWifiSmeCloakedSsidsSetReq *) voidPrimitivePointer;
1741 CsrPmemFree(primitive->cloakedSsids.cloakedSsids); 1742 kfree(primitive->cloakedSsids.cloakedSsids);
1742 CsrPmemFree(primitive); 1743 kfree(primitive);
1743} 1744}
1744 1745
1745 1746
@@ -1893,8 +1894,8 @@ void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length)
1893void CsrWifiSmeWpsConfigurationReqSerFree(void *voidPrimitivePointer) 1894void CsrWifiSmeWpsConfigurationReqSerFree(void *voidPrimitivePointer)
1894{ 1895{
1895 CsrWifiSmeWpsConfigurationReq *primitive = (CsrWifiSmeWpsConfigurationReq *) voidPrimitivePointer; 1896 CsrWifiSmeWpsConfigurationReq *primitive = (CsrWifiSmeWpsConfigurationReq *) voidPrimitivePointer;
1896 CsrPmemFree(primitive->wpsConfig.secondaryDeviceType); 1897 kfree(primitive->wpsConfig.secondaryDeviceType);
1897 CsrPmemFree(primitive); 1898 kfree(primitive);
1898} 1899}
1899 1900
1900 1901
@@ -1949,8 +1950,8 @@ void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length)
1949void CsrWifiSmeSetReqSerFree(void *voidPrimitivePointer) 1950void CsrWifiSmeSetReqSerFree(void *voidPrimitivePointer)
1950{ 1951{
1951 CsrWifiSmeSetReq *primitive = (CsrWifiSmeSetReq *) voidPrimitivePointer; 1952 CsrWifiSmeSetReq *primitive = (CsrWifiSmeSetReq *) voidPrimitivePointer;
1952 CsrPmemFree(primitive->data); 1953 kfree(primitive->data);
1953 CsrPmemFree(primitive); 1954 kfree(primitive);
1954} 1955}
1955 1956
1956 1957
@@ -2201,13 +2202,13 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2201void CsrWifiSmeAssociationCompleteIndSerFree(void *voidPrimitivePointer) 2202void CsrWifiSmeAssociationCompleteIndSerFree(void *voidPrimitivePointer)
2202{ 2203{
2203 CsrWifiSmeAssociationCompleteInd *primitive = (CsrWifiSmeAssociationCompleteInd *) voidPrimitivePointer; 2204 CsrWifiSmeAssociationCompleteInd *primitive = (CsrWifiSmeAssociationCompleteInd *) voidPrimitivePointer;
2204 CsrPmemFree(primitive->connectionInfo.beaconFrame); 2205 kfree(primitive->connectionInfo.beaconFrame);
2205 CsrPmemFree(primitive->connectionInfo.associationReqFrame); 2206 kfree(primitive->connectionInfo.associationReqFrame);
2206 CsrPmemFree(primitive->connectionInfo.associationRspFrame); 2207 kfree(primitive->connectionInfo.associationRspFrame);
2207 CsrPmemFree(primitive->connectionInfo.assocScanInfoElements); 2208 kfree(primitive->connectionInfo.assocScanInfoElements);
2208 CsrPmemFree(primitive->connectionInfo.assocReqInfoElements); 2209 kfree(primitive->connectionInfo.assocReqInfoElements);
2209 CsrPmemFree(primitive->connectionInfo.assocRspInfoElements); 2210 kfree(primitive->connectionInfo.assocRspInfoElements);
2210 CsrPmemFree(primitive); 2211 kfree(primitive);
2211} 2212}
2212 2213
2213 2214
@@ -2325,8 +2326,8 @@ void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length)
2325void CsrWifiSmeBlacklistCfmSerFree(void *voidPrimitivePointer) 2326void CsrWifiSmeBlacklistCfmSerFree(void *voidPrimitivePointer)
2326{ 2327{
2327 CsrWifiSmeBlacklistCfm *primitive = (CsrWifiSmeBlacklistCfm *) voidPrimitivePointer; 2328 CsrWifiSmeBlacklistCfm *primitive = (CsrWifiSmeBlacklistCfm *) voidPrimitivePointer;
2328 CsrPmemFree(primitive->getAddresses); 2329 kfree(primitive->getAddresses);
2329 CsrPmemFree(primitive); 2330 kfree(primitive);
2330} 2331}
2331 2332
2332 2333
@@ -2384,8 +2385,8 @@ void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length)
2384void CsrWifiSmeCalibrationDataGetCfmSerFree(void *voidPrimitivePointer) 2385void CsrWifiSmeCalibrationDataGetCfmSerFree(void *voidPrimitivePointer)
2385{ 2386{
2386 CsrWifiSmeCalibrationDataGetCfm *primitive = (CsrWifiSmeCalibrationDataGetCfm *) voidPrimitivePointer; 2387 CsrWifiSmeCalibrationDataGetCfm *primitive = (CsrWifiSmeCalibrationDataGetCfm *) voidPrimitivePointer;
2387 CsrPmemFree(primitive->calibrationData); 2388 kfree(primitive->calibrationData);
2388 CsrPmemFree(primitive); 2389 kfree(primitive);
2389} 2390}
2390 2391
2391 2392
@@ -2737,8 +2738,8 @@ void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length)
2737void CsrWifiSmeConnectionConfigGetCfmSerFree(void *voidPrimitivePointer) 2738void CsrWifiSmeConnectionConfigGetCfmSerFree(void *voidPrimitivePointer)
2738{ 2739{
2739 CsrWifiSmeConnectionConfigGetCfm *primitive = (CsrWifiSmeConnectionConfigGetCfm *) voidPrimitivePointer; 2740 CsrWifiSmeConnectionConfigGetCfm *primitive = (CsrWifiSmeConnectionConfigGetCfm *) voidPrimitivePointer;
2740 CsrPmemFree(primitive->connectionConfig.mlmeAssociateReqInformationElements); 2741 kfree(primitive->connectionConfig.mlmeAssociateReqInformationElements);
2741 CsrPmemFree(primitive); 2742 kfree(primitive);
2742} 2743}
2743 2744
2744 2745
@@ -2941,13 +2942,13 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2941void CsrWifiSmeConnectionInfoGetCfmSerFree(void *voidPrimitivePointer) 2942void CsrWifiSmeConnectionInfoGetCfmSerFree(void *voidPrimitivePointer)
2942{ 2943{
2943 CsrWifiSmeConnectionInfoGetCfm *primitive = (CsrWifiSmeConnectionInfoGetCfm *) voidPrimitivePointer; 2944 CsrWifiSmeConnectionInfoGetCfm *primitive = (CsrWifiSmeConnectionInfoGetCfm *) voidPrimitivePointer;
2944 CsrPmemFree(primitive->connectionInfo.beaconFrame); 2945 kfree(primitive->connectionInfo.beaconFrame);
2945 CsrPmemFree(primitive->connectionInfo.associationReqFrame); 2946 kfree(primitive->connectionInfo.associationReqFrame);
2946 CsrPmemFree(primitive->connectionInfo.associationRspFrame); 2947 kfree(primitive->connectionInfo.associationRspFrame);
2947 CsrPmemFree(primitive->connectionInfo.assocScanInfoElements); 2948 kfree(primitive->connectionInfo.assocScanInfoElements);
2948 CsrPmemFree(primitive->connectionInfo.assocReqInfoElements); 2949 kfree(primitive->connectionInfo.assocReqInfoElements);
2949 CsrPmemFree(primitive->connectionInfo.assocRspInfoElements); 2950 kfree(primitive->connectionInfo.assocRspInfoElements);
2950 CsrPmemFree(primitive); 2951 kfree(primitive);
2951} 2952}
2952 2953
2953 2954
@@ -3543,13 +3544,13 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3543void CsrWifiSmeMediaStatusIndSerFree(void *voidPrimitivePointer) 3544void CsrWifiSmeMediaStatusIndSerFree(void *voidPrimitivePointer)
3544{ 3545{
3545 CsrWifiSmeMediaStatusInd *primitive = (CsrWifiSmeMediaStatusInd *) voidPrimitivePointer; 3546 CsrWifiSmeMediaStatusInd *primitive = (CsrWifiSmeMediaStatusInd *) voidPrimitivePointer;
3546 CsrPmemFree(primitive->connectionInfo.beaconFrame); 3547 kfree(primitive->connectionInfo.beaconFrame);
3547 CsrPmemFree(primitive->connectionInfo.associationReqFrame); 3548 kfree(primitive->connectionInfo.associationReqFrame);
3548 CsrPmemFree(primitive->connectionInfo.associationRspFrame); 3549 kfree(primitive->connectionInfo.associationRspFrame);
3549 CsrPmemFree(primitive->connectionInfo.assocScanInfoElements); 3550 kfree(primitive->connectionInfo.assocScanInfoElements);
3550 CsrPmemFree(primitive->connectionInfo.assocReqInfoElements); 3551 kfree(primitive->connectionInfo.assocReqInfoElements);
3551 CsrPmemFree(primitive->connectionInfo.assocRspInfoElements); 3552 kfree(primitive->connectionInfo.assocRspInfoElements);
3552 CsrPmemFree(primitive); 3553 kfree(primitive);
3553} 3554}
3554 3555
3555 3556
@@ -3655,8 +3656,8 @@ void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length)
3655void CsrWifiSmeMibGetCfmSerFree(void *voidPrimitivePointer) 3656void CsrWifiSmeMibGetCfmSerFree(void *voidPrimitivePointer)
3656{ 3657{
3657 CsrWifiSmeMibGetCfm *primitive = (CsrWifiSmeMibGetCfm *) voidPrimitivePointer; 3658 CsrWifiSmeMibGetCfm *primitive = (CsrWifiSmeMibGetCfm *) voidPrimitivePointer;
3658 CsrPmemFree(primitive->mibAttribute); 3659 kfree(primitive->mibAttribute);
3659 CsrPmemFree(primitive); 3660 kfree(primitive);
3660} 3661}
3661 3662
3662 3663
@@ -3714,8 +3715,8 @@ void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length)
3714void CsrWifiSmeMibGetNextCfmSerFree(void *voidPrimitivePointer) 3715void CsrWifiSmeMibGetNextCfmSerFree(void *voidPrimitivePointer)
3715{ 3716{
3716 CsrWifiSmeMibGetNextCfm *primitive = (CsrWifiSmeMibGetNextCfm *) voidPrimitivePointer; 3717 CsrWifiSmeMibGetNextCfm *primitive = (CsrWifiSmeMibGetNextCfm *) voidPrimitivePointer;
3717 CsrPmemFree(primitive->mibAttribute); 3718 kfree(primitive->mibAttribute);
3718 CsrPmemFree(primitive); 3719 kfree(primitive);
3719} 3720}
3720 3721
3721 3722
@@ -3836,8 +3837,8 @@ void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length)
3836void CsrWifiSmeMulticastAddressCfmSerFree(void *voidPrimitivePointer) 3837void CsrWifiSmeMulticastAddressCfmSerFree(void *voidPrimitivePointer)
3837{ 3838{
3838 CsrWifiSmeMulticastAddressCfm *primitive = (CsrWifiSmeMulticastAddressCfm *) voidPrimitivePointer; 3839 CsrWifiSmeMulticastAddressCfm *primitive = (CsrWifiSmeMulticastAddressCfm *) voidPrimitivePointer;
3839 CsrPmemFree(primitive->getAddresses); 3840 kfree(primitive->getAddresses);
3840 CsrPmemFree(primitive); 3841 kfree(primitive);
3841} 3842}
3842 3843
3843 3844
@@ -3982,8 +3983,8 @@ void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length)
3982void CsrWifiSmePmkidCandidateListIndSerFree(void *voidPrimitivePointer) 3983void CsrWifiSmePmkidCandidateListIndSerFree(void *voidPrimitivePointer)
3983{ 3984{
3984 CsrWifiSmePmkidCandidateListInd *primitive = (CsrWifiSmePmkidCandidateListInd *) voidPrimitivePointer; 3985 CsrWifiSmePmkidCandidateListInd *primitive = (CsrWifiSmePmkidCandidateListInd *) voidPrimitivePointer;
3985 CsrPmemFree(primitive->pmkidCandidates); 3986 kfree(primitive->pmkidCandidates);
3986 CsrPmemFree(primitive); 3987 kfree(primitive);
3987} 3988}
3988 3989
3989 3990
@@ -4062,8 +4063,8 @@ void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length)
4062void CsrWifiSmePmkidCfmSerFree(void *voidPrimitivePointer) 4063void CsrWifiSmePmkidCfmSerFree(void *voidPrimitivePointer)
4063{ 4064{
4064 CsrWifiSmePmkidCfm *primitive = (CsrWifiSmePmkidCfm *) voidPrimitivePointer; 4065 CsrWifiSmePmkidCfm *primitive = (CsrWifiSmePmkidCfm *) voidPrimitivePointer;
4065 CsrPmemFree(primitive->getPmkids); 4066 kfree(primitive->getPmkids);
4066 CsrPmemFree(primitive); 4067 kfree(primitive);
4067} 4068}
4068 4069
4069 4070
@@ -4505,8 +4506,8 @@ void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length)
4505void CsrWifiSmeScanConfigGetCfmSerFree(void *voidPrimitivePointer) 4506void CsrWifiSmeScanConfigGetCfmSerFree(void *voidPrimitivePointer)
4506{ 4507{
4507 CsrWifiSmeScanConfigGetCfm *primitive = (CsrWifiSmeScanConfigGetCfm *) voidPrimitivePointer; 4508 CsrWifiSmeScanConfigGetCfm *primitive = (CsrWifiSmeScanConfigGetCfm *) voidPrimitivePointer;
4508 CsrPmemFree(primitive->scanConfig.passiveChannelList); 4509 kfree(primitive->scanConfig.passiveChannelList);
4509 CsrPmemFree(primitive); 4510 kfree(primitive);
4510} 4511}
4511 4512
4512 4513
@@ -4780,7 +4781,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4780void CsrWifiSmeScanResultIndSerFree(void *voidPrimitivePointer) 4781void CsrWifiSmeScanResultIndSerFree(void *voidPrimitivePointer)
4781{ 4782{
4782 CsrWifiSmeScanResultInd *primitive = (CsrWifiSmeScanResultInd *) voidPrimitivePointer; 4783 CsrWifiSmeScanResultInd *primitive = (CsrWifiSmeScanResultInd *) voidPrimitivePointer;
4783 CsrPmemFree(primitive->result.informationElements); 4784 kfree(primitive->result.informationElements);
4784 switch (primitive->result.p2pDeviceRole) 4785 switch (primitive->result.p2pDeviceRole)
4785 { 4786 {
4786 case CSR_WIFI_SME_P2P_ROLE_GO: 4787 case CSR_WIFI_SME_P2P_ROLE_GO:
@@ -4788,18 +4789,18 @@ void CsrWifiSmeScanResultIndSerFree(void *voidPrimitivePointer)
4788 u16 i4; 4789 u16 i4;
4789 for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) 4790 for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++)
4790 { 4791 {
4791 CsrPmemFree(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); 4792 kfree(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
4792 } 4793 }
4793 } 4794 }
4794 CsrPmemFree(primitive->result.deviceInfo.groupInfo.p2PClientInfo); 4795 kfree(primitive->result.deviceInfo.groupInfo.p2PClientInfo);
4795 break; 4796 break;
4796 case CSR_WIFI_SME_P2P_ROLE_STANDALONE: 4797 case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
4797 CsrPmemFree(primitive->result.deviceInfo.standalonedevInfo.secDeviceType); 4798 kfree(primitive->result.deviceInfo.standalonedevInfo.secDeviceType);
4798 break; 4799 break;
4799 default: 4800 default:
4800 break; 4801 break;
4801 } 4802 }
4802 CsrPmemFree(primitive); 4803 kfree(primitive);
4803} 4804}
4804 4805
4805 4806
@@ -5106,7 +5107,7 @@ void CsrWifiSmeScanResultsGetCfmSerFree(void *voidPrimitivePointer)
5106 u16 i1; 5107 u16 i1;
5107 for (i1 = 0; i1 < primitive->scanResultsCount; i1++) 5108 for (i1 = 0; i1 < primitive->scanResultsCount; i1++)
5108 { 5109 {
5109 CsrPmemFree(primitive->scanResults[i1].informationElements); 5110 kfree(primitive->scanResults[i1].informationElements);
5110 switch (primitive->scanResults[i1].p2pDeviceRole) 5111 switch (primitive->scanResults[i1].p2pDeviceRole)
5111 { 5112 {
5112 case CSR_WIFI_SME_P2P_ROLE_GO: 5113 case CSR_WIFI_SME_P2P_ROLE_GO:
@@ -5114,21 +5115,21 @@ void CsrWifiSmeScanResultsGetCfmSerFree(void *voidPrimitivePointer)
5114 u16 i4; 5115 u16 i4;
5115 for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) 5116 for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++)
5116 { 5117 {
5117 CsrPmemFree(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); 5118 kfree(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
5118 } 5119 }
5119 } 5120 }
5120 CsrPmemFree(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo); 5121 kfree(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo);
5121 break; 5122 break;
5122 case CSR_WIFI_SME_P2P_ROLE_STANDALONE: 5123 case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
5123 CsrPmemFree(primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType); 5124 kfree(primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType);
5124 break; 5125 break;
5125 default: 5126 default:
5126 break; 5127 break;
5127 } 5128 }
5128 } 5129 }
5129 } 5130 }
5130 CsrPmemFree(primitive->scanResults); 5131 kfree(primitive->scanResults);
5131 CsrPmemFree(primitive); 5132 kfree(primitive);
5132} 5133}
5133 5134
5134 5135
@@ -5336,8 +5337,8 @@ void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length)
5336void CsrWifiSmeTspecIndSerFree(void *voidPrimitivePointer) 5337void CsrWifiSmeTspecIndSerFree(void *voidPrimitivePointer)
5337{ 5338{
5338 CsrWifiSmeTspecInd *primitive = (CsrWifiSmeTspecInd *) voidPrimitivePointer; 5339 CsrWifiSmeTspecInd *primitive = (CsrWifiSmeTspecInd *) voidPrimitivePointer;
5339 CsrPmemFree(primitive->tspec); 5340 kfree(primitive->tspec);
5340 CsrPmemFree(primitive); 5341 kfree(primitive);
5341} 5342}
5342 5343
5343 5344
@@ -5404,8 +5405,8 @@ void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length)
5404void CsrWifiSmeTspecCfmSerFree(void *voidPrimitivePointer) 5405void CsrWifiSmeTspecCfmSerFree(void *voidPrimitivePointer)
5405{ 5406{
5406 CsrWifiSmeTspecCfm *primitive = (CsrWifiSmeTspecCfm *) voidPrimitivePointer; 5407 CsrWifiSmeTspecCfm *primitive = (CsrWifiSmeTspecCfm *) voidPrimitivePointer;
5407 CsrPmemFree(primitive->tspec); 5408 kfree(primitive->tspec);
5408 CsrPmemFree(primitive); 5409 kfree(primitive);
5409} 5410}
5410 5411
5411 5412
@@ -5473,9 +5474,9 @@ void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t length)
5473void CsrWifiSmeVersionsGetCfmSerFree(void *voidPrimitivePointer) 5474void CsrWifiSmeVersionsGetCfmSerFree(void *voidPrimitivePointer)
5474{ 5475{
5475 CsrWifiSmeVersionsGetCfm *primitive = (CsrWifiSmeVersionsGetCfm *) voidPrimitivePointer; 5476 CsrWifiSmeVersionsGetCfm *primitive = (CsrWifiSmeVersionsGetCfm *) voidPrimitivePointer;
5476 CsrPmemFree(primitive->versions.routerBuild); 5477 kfree(primitive->versions.routerBuild);
5477 CsrPmemFree(primitive->versions.smeBuild); 5478 kfree(primitive->versions.smeBuild);
5478 CsrPmemFree(primitive); 5479 kfree(primitive);
5479} 5480}
5480 5481
5481 5482
@@ -5548,8 +5549,8 @@ void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length)
5548void CsrWifiSmeCloakedSsidsGetCfmSerFree(void *voidPrimitivePointer) 5549void CsrWifiSmeCloakedSsidsGetCfmSerFree(void *voidPrimitivePointer)
5549{ 5550{
5550 CsrWifiSmeCloakedSsidsGetCfm *primitive = (CsrWifiSmeCloakedSsidsGetCfm *) voidPrimitivePointer; 5551 CsrWifiSmeCloakedSsidsGetCfm *primitive = (CsrWifiSmeCloakedSsidsGetCfm *) voidPrimitivePointer;
5551 CsrPmemFree(primitive->cloakedSsids.cloakedSsids); 5552 kfree(primitive->cloakedSsids.cloakedSsids);
5552 CsrPmemFree(primitive); 5553 kfree(primitive);
5553} 5554}
5554 5555
5555 5556
@@ -5707,8 +5708,8 @@ void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t length)
5707void CsrWifiSmeErrorIndSerFree(void *voidPrimitivePointer) 5708void CsrWifiSmeErrorIndSerFree(void *voidPrimitivePointer)
5708{ 5709{
5709 CsrWifiSmeErrorInd *primitive = (CsrWifiSmeErrorInd *) voidPrimitivePointer; 5710 CsrWifiSmeErrorInd *primitive = (CsrWifiSmeErrorInd *) voidPrimitivePointer;
5710 CsrPmemFree(primitive->errorMessage); 5711 kfree(primitive->errorMessage);
5711 CsrPmemFree(primitive); 5712 kfree(primitive);
5712} 5713}
5713 5714
5714 5715
@@ -5749,8 +5750,8 @@ void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t length)
5749void CsrWifiSmeInfoIndSerFree(void *voidPrimitivePointer) 5750void CsrWifiSmeInfoIndSerFree(void *voidPrimitivePointer)
5750{ 5751{
5751 CsrWifiSmeInfoInd *primitive = (CsrWifiSmeInfoInd *) voidPrimitivePointer; 5752 CsrWifiSmeInfoInd *primitive = (CsrWifiSmeInfoInd *) voidPrimitivePointer;
5752 CsrPmemFree(primitive->infoMessage); 5753 kfree(primitive->infoMessage);
5753 CsrPmemFree(primitive); 5754 kfree(primitive);
5754} 5755}
5755 5756
5756 5757
@@ -5805,8 +5806,8 @@ void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length)
5805void CsrWifiSmeCoreDumpIndSerFree(void *voidPrimitivePointer) 5806void CsrWifiSmeCoreDumpIndSerFree(void *voidPrimitivePointer)
5806{ 5807{
5807 CsrWifiSmeCoreDumpInd *primitive = (CsrWifiSmeCoreDumpInd *) voidPrimitivePointer; 5808 CsrWifiSmeCoreDumpInd *primitive = (CsrWifiSmeCoreDumpInd *) voidPrimitivePointer;
5808 CsrPmemFree(primitive->data); 5809 kfree(primitive->data);
5809 CsrPmemFree(primitive); 5810 kfree(primitive);
5810} 5811}
5811 5812
5812 5813
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c
index 36d9d539f9f0..6f5b3dd7ce1f 100644
--- a/drivers/staging/csr/drv.c
+++ b/drivers/staging/csr/drv.c
@@ -1476,7 +1476,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
1476 1476
1477 if (pcli->snap_filter.count) { 1477 if (pcli->snap_filter.count) {
1478 pcli->snap_filter.count = 0; 1478 pcli->snap_filter.count = 0;
1479 CsrPmemFree(pcli->snap_filter.protocols); 1479 kfree(pcli->snap_filter.protocols);
1480 } 1480 }
1481 1481
1482 if (snap_filter.count == 0) { 1482 if (snap_filter.count == 0) {
@@ -1492,7 +1492,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
1492 (void*)snap_filter.protocols, 1492 (void*)snap_filter.protocols,
1493 snap_filter.count * sizeof(u16))) 1493 snap_filter.count * sizeof(u16)))
1494 { 1494 {
1495 CsrPmemFree(pcli->snap_filter.protocols); 1495 kfree(pcli->snap_filter.protocols);
1496 r = -EFAULT; 1496 r = -EFAULT;
1497 goto out; 1497 goto out;
1498 } 1498 }
@@ -1938,7 +1938,7 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
1938 if (logptr == NULL) { 1938 if (logptr == NULL) {
1939 unifi_error(priv, "Failed to allocate %d bytes for an SME message\n", 1939 unifi_error(priv, "Failed to allocate %d bytes for an SME message\n",
1940 sizeof(udi_log_t) + length); 1940 sizeof(udi_log_t) + length);
1941 CsrPmemFree(buffer); 1941 kfree(buffer);
1942 return -ENOMEM; 1942 return -ENOMEM;
1943 } 1943 }
1944 1944
@@ -1956,7 +1956,7 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
1956 down(&udi_mutex); 1956 down(&udi_mutex);
1957 if (priv->sme_cli == NULL) { 1957 if (priv->sme_cli == NULL) {
1958 kfree(logptr); 1958 kfree(logptr);
1959 CsrPmemFree(buffer); 1959 kfree(buffer);
1960 up(&udi_mutex); 1960 up(&udi_mutex);
1961 unifi_info(priv, "Message for the SME dropped, SME has gone away\n"); 1961 unifi_info(priv, "Message for the SME dropped, SME has gone away\n");
1962 return 0; 1962 return 0;
@@ -1971,7 +1971,7 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
1971 up(&udi_mutex); 1971 up(&udi_mutex);
1972 1972
1973 /* It is our responsibility to free the buffer allocated in build_packed_*() */ 1973 /* It is our responsibility to free the buffer allocated in build_packed_*() */
1974 CsrPmemFree(buffer); 1974 kfree(buffer);
1975 1975
1976 func_exit(); 1976 func_exit();
1977 1977
diff --git a/drivers/staging/csr/putest.c b/drivers/staging/csr/putest.c
index 96597ac5330d..f2cb11e1b210 100644
--- a/drivers/staging/csr/putest.c
+++ b/drivers/staging/csr/putest.c
@@ -499,7 +499,7 @@ int unifi_putest_dl_fw_buff(unifi_priv_t *priv, unsigned char *arg)
499 fw_user_ptr = ((unsigned char*)arg) + sizeof(unifi_putest_command_t) + sizeof(unsigned int); 499 fw_user_ptr = ((unsigned char*)arg) + sizeof(unifi_putest_command_t) + sizeof(unsigned int);
500 if (copy_from_user(fw_buf, (void*)fw_user_ptr, fw_length)) { 500 if (copy_from_user(fw_buf, (void*)fw_user_ptr, fw_length)) {
501 unifi_error(priv, "unifi_putest_dl_fw_buff: Failed to get the buffer\n"); 501 unifi_error(priv, "unifi_putest_dl_fw_buff: Failed to get the buffer\n");
502 CsrPmemFree(fw_buf); 502 kfree(fw_buf);
503 return -EFAULT; 503 return -EFAULT;
504 } 504 }
505 505
@@ -537,7 +537,7 @@ int unifi_putest_dl_fw_buff(unifi_priv_t *priv, unsigned char *arg)
537free_fw: 537free_fw:
538 /* Finished with the putest f/w, so restore the station f/w */ 538 /* Finished with the putest f/w, so restore the station f/w */
539 priv->fw_sta = temp_fw_sta; 539 priv->fw_sta = temp_fw_sta;
540 CsrPmemFree(fw_buf); 540 kfree(fw_buf);
541 541
542 return CsrHipResultToStatus(csrResult); 542 return CsrHipResultToStatus(csrResult);
543} 543}
diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c
index 3f0d70d56a26..acf0f0fe3b37 100644
--- a/drivers/staging/csr/sme_blocking.c
+++ b/drivers/staging/csr/sme_blocking.c
@@ -415,7 +415,7 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv,
415 scan_result, i+1); 415 scan_result, i+1);
416 416
417 if (r < 0) { 417 if (r < 0) {
418 CsrPmemFree(scan_result_list); 418 kfree(scan_result_list);
419 priv->sme_reply.reply_scan_results_count = 0; 419 priv->sme_reply.reply_scan_results_count = 0;
420 priv->sme_reply.reply_scan_results = NULL; 420 priv->sme_reply.reply_scan_results = NULL;
421 return r; 421 return r;
@@ -429,7 +429,7 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv,
429 * and invalidate the reply_scan_results to avoid re-using 429 * and invalidate the reply_scan_results to avoid re-using
430 * the freed pointers. 430 * the freed pointers.
431 */ 431 */
432 CsrPmemFree(scan_result_list); 432 kfree(scan_result_list);
433 priv->sme_reply.reply_scan_results_count = 0; 433 priv->sme_reply.reply_scan_results_count = 0;
434 priv->sme_reply.reply_scan_results = NULL; 434 priv->sme_reply.reply_scan_results = NULL;
435 435
diff --git a/drivers/staging/csr/sme_userspace.c b/drivers/staging/csr/sme_userspace.c
index 5dc7a2e376ee..abcb446fb8c0 100644
--- a/drivers/staging/csr/sme_userspace.c
+++ b/drivers/staging/csr/sme_userspace.c
@@ -128,7 +128,7 @@ uf_sme_deinit(unifi_priv_t *priv)
128 /* Free any TCLASs previously allocated */ 128 /* Free any TCLASs previously allocated */
129 if (priv->packet_filters.tclas_ies_length) { 129 if (priv->packet_filters.tclas_ies_length) {
130 priv->packet_filters.tclas_ies_length = 0; 130 priv->packet_filters.tclas_ies_length = 0;
131 CsrPmemFree(priv->filter_tclas_ies); 131 kfree(priv->filter_tclas_ies);
132 priv->filter_tclas_ies = NULL; 132 priv->filter_tclas_ies = NULL;
133 } 133 }
134 134
diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c
index d71bb05239e7..d8a728b1a1b2 100644
--- a/drivers/staging/csr/ul_int.c
+++ b/drivers/staging/csr/ul_int.c
@@ -117,9 +117,9 @@ ul_register_client(unifi_priv_t *priv, unsigned int configuration,
117 /* If allocation fails, free allocated memory. */ 117 /* If allocation fails, free allocated memory. */
118 if (ul_clients[id].reply_bulkdata[ref] == NULL) { 118 if (ul_clients[id].reply_bulkdata[ref] == NULL) {
119 for (; ref > 0; ref --) { 119 for (; ref > 0; ref --) {
120 CsrPmemFree(ul_clients[id].reply_bulkdata[ref - 1]); 120 kfree(ul_clients[id].reply_bulkdata[ref - 1]);
121 } 121 }
122 CsrPmemFree(ul_clients[id].reply_signal); 122 kfree(ul_clients[id].reply_signal);
123 unifi_error(priv, "Failed to allocate bulk data buffers for client.\n"); 123 unifi_error(priv, "Failed to allocate bulk data buffers for client.\n");
124 return NULL; 124 return NULL;
125 } 125 }
@@ -164,14 +164,14 @@ ul_deregister_client(ul_client_t *ul_client)
164 unifi_trace(priv, UDBG5, "UDI (0x%x) deregistered.\n", ul_client); 164 unifi_trace(priv, UDBG5, "UDI (0x%x) deregistered.\n", ul_client);
165 165
166 /* Free memory allocated for the reply signal and its bulk data. */ 166 /* Free memory allocated for the reply signal and its bulk data. */
167 CsrPmemFree(ul_client->reply_signal); 167 kfree(ul_client->reply_signal);
168 for (ref = 0; ref < UNIFI_MAX_DATA_REFERENCES; ref ++) { 168 for (ref = 0; ref < UNIFI_MAX_DATA_REFERENCES; ref ++) {
169 CsrPmemFree(ul_client->reply_bulkdata[ref]); 169 kfree(ul_client->reply_bulkdata[ref]);
170 } 170 }
171 171
172 if (ul_client->snap_filter.count) { 172 if (ul_client->snap_filter.count) {
173 ul_client->snap_filter.count = 0; 173 ul_client->snap_filter.count = 0;
174 CsrPmemFree(ul_client->snap_filter.protocols); 174 kfree(ul_client->snap_filter.protocols);
175 } 175 }
176 176
177 /* Free anything pending on the udi_log list */ 177 /* Free anything pending on the udi_log list */
diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c
index 51d679234a52..0cb7b0145eda 100644
--- a/drivers/staging/csr/unifi_sme.c
+++ b/drivers/staging/csr/unifi_sme.c
@@ -423,7 +423,7 @@ uf_multicast_list_wq(struct work_struct *work)
423 } 423 }
424 424
425 if (priv->smepriv == NULL) { 425 if (priv->smepriv == NULL) {
426 CsrPmemFree(multicast_address_list); 426 kfree(multicast_address_list);
427 return; 427 return;
428 } 428 }
429 429
@@ -433,7 +433,7 @@ uf_multicast_list_wq(struct work_struct *work)
433 mc_count, multicast_address_list); 433 mc_count, multicast_address_list);
434 434
435 /* The SME will take a copy of the addreses*/ 435 /* The SME will take a copy of the addreses*/
436 CsrPmemFree(multicast_address_list); 436 kfree(multicast_address_list);
437} 437}
438 438
439 439
@@ -572,7 +572,7 @@ int unifi_cfg_packet_filters(unifi_priv_t *priv, unsigned char *arg)
572 572
573 /* Free any TCLASs previously allocated */ 573 /* Free any TCLASs previously allocated */
574 if (priv->packet_filters.tclas_ies_length) { 574 if (priv->packet_filters.tclas_ies_length) {
575 CsrPmemFree(priv->filter_tclas_ies); 575 kfree(priv->filter_tclas_ies);
576 priv->filter_tclas_ies = NULL; 576 priv->filter_tclas_ies = NULL;
577 } 577 }
578 578
@@ -683,7 +683,7 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg)
683 rc = copy_from_user(addts_ie, addts_params, addts_ie_length); 683 rc = copy_from_user(addts_ie, addts_params, addts_ie_length);
684 if (rc) { 684 if (rc) {
685 unifi_error(priv, "unifi_cfg_wmm_addts: Failed to get the addts buffer\n"); 685 unifi_error(priv, "unifi_cfg_wmm_addts: Failed to get the addts buffer\n");
686 CsrPmemFree(addts_ie); 686 kfree(addts_ie);
687 return -EFAULT; 687 return -EFAULT;
688 } 688 }
689 689
@@ -695,7 +695,7 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg)
695 rc = sme_mgt_tspec(priv, CSR_WIFI_SME_LIST_ACTION_ADD, addts_tid, 695 rc = sme_mgt_tspec(priv, CSR_WIFI_SME_LIST_ACTION_ADD, addts_tid,
696 &tspec, &tclas); 696 &tspec, &tclas);
697 697
698 CsrPmemFree(addts_ie); 698 kfree(addts_ie);
699 return rc; 699 return rc;
700} 700}
701 701
@@ -1229,7 +1229,7 @@ void uf_send_pkt_to_encrypt(struct work_struct *work)
1229 CsrWifiRouterCtrlWapiUnicastTxEncryptIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, interfaceTag, pktBulkDataLength, pktBulkData); 1229 CsrWifiRouterCtrlWapiUnicastTxEncryptIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, interfaceTag, pktBulkDataLength, pktBulkData);
1230 unifi_trace(priv, UDBG1, "WapiUnicastTxEncryptInd sent to SME\n"); 1230 unifi_trace(priv, UDBG1, "WapiUnicastTxEncryptInd sent to SME\n");
1231 1231
1232 CsrPmemFree(pktBulkData); /* Would have been copied over by the SME Handler */ 1232 kfree(pktBulkData); /* Would have been copied over by the SME Handler */
1233 1233
1234 func_exit(); 1234 func_exit();
1235 } else { 1235 } else {
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-25 15:21:19 -0500