Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / drivers / staging / csr / csr_wifi_nme_ap_free_downstream_contents.c

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 8a95f3ceeff249181d342d5024608b2178a7bed1..ab9358873ec320c63974a57ac5da0bf356b18ad5 100644 (file)
--- 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,8 +9,7 @@
 *****************************************************************************/
 
 /* Note: this is an auto-generated file. */
-
-#include "csr_pmem.h"
+#include <linux/slab.h>
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_ap_lib.h"
 
@@ -25,7 +24,7 @@
  *      eventClass: only the value CSR_WIFI_NME_AP_PRIM will be handled
  *      message:    the message to free
  *----------------------------------------------------------------------------*/
-void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *message)
+void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message)
 {
     if (eventClass != CSR_WIFI_NME_AP_PRIM)
     {
@@ -41,7 +40,7 @@ void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *messa
         case CSR_WIFI_NME_AP_CONFIG_SET_REQ:
         {
             CsrWifiNmeApConfigSetReq *p = (CsrWifiNmeApConfigSetReq *)message;
-            CsrPmemFree(p->apMacConfig.macAddressList);
+            kfree(p->apMacConfig.macAddressList);
             p->apMacConfig.macAddressList = NULL;
             break;
         }
@@ -54,7 +53,7 @@ void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *messa
                     switch (p->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase)
                     {
                         case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE:
-                            CsrPmemFree(p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase);
+                            kfree(p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase);
                             p->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase = NULL;
                             break;
                         default:
@@ -65,14 +64,14 @@ void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *messa
                     break;
             }
             {
-                CsrUint16 i3;
+                u16 i3;
                 for (i3 = 0; i3 < p->p2pGoParam.operatingChanList.channelEntryListCount; i3++)
                 {
-                    CsrPmemFree(p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel);
+                    kfree(p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel);
                     p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = NULL;
                 }
             }
-            CsrPmemFree(p->p2pGoParam.operatingChanList.channelEntryList);
+            kfree(p->p2pGoParam.operatingChanList.channelEntryList);
             p->p2pGoParam.operatingChanList.channelEntryList = NULL;
             break;
         }