aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:59:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:59:12 -0700
commit55a27055b9ea5aabf8206ed6b7777c79f4e840c3 (patch)
tree29867609589a69e8a86e6e76b0885f0dbf4ce78f /drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
parent4becf12de1a4efefd28e057750e35f4ceb32dd1d (diff)
staging: csr: remove CsrPmemFree()
It's just a wrapper around kfree() so call that instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c')
-rw-r--r--drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c90
1 files changed, 45 insertions, 45 deletions
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 c34b57e960d..1977747a51d 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 @@
*****************************************************************************/
/* Note: this is an auto-generated file. */
-
+#include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_sme_prim.h"
#include "csr_wifi_sme_lib.h"
@@ -41,121 +41,121 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
case CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND:
{
CsrWifiSmeAssociationCompleteInd *p = (CsrWifiSmeAssociationCompleteInd *)message;
- CsrPmemFree(p->connectionInfo.beaconFrame);
+ kfree(p->connectionInfo.beaconFrame);
p->connectionInfo.beaconFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationReqFrame);
+ kfree(p->connectionInfo.associationReqFrame);
p->connectionInfo.associationReqFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationRspFrame);
+ kfree(p->connectionInfo.associationRspFrame);
p->connectionInfo.associationRspFrame = NULL;
- CsrPmemFree(p->connectionInfo.assocScanInfoElements);
+ kfree(p->connectionInfo.assocScanInfoElements);
p->connectionInfo.assocScanInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocReqInfoElements);
+ kfree(p->connectionInfo.assocReqInfoElements);
p->connectionInfo.assocReqInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocRspInfoElements);
+ kfree(p->connectionInfo.assocRspInfoElements);
p->connectionInfo.assocRspInfoElements = NULL;
break;
}
case CSR_WIFI_SME_BLACKLIST_CFM:
{
CsrWifiSmeBlacklistCfm *p = (CsrWifiSmeBlacklistCfm *)message;
- CsrPmemFree(p->getAddresses);
+ kfree(p->getAddresses);
p->getAddresses = NULL;
break;
}
case CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM:
{
CsrWifiSmeCalibrationDataGetCfm *p = (CsrWifiSmeCalibrationDataGetCfm *)message;
- CsrPmemFree(p->calibrationData);
+ kfree(p->calibrationData);
p->calibrationData = NULL;
break;
}
case CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM:
{
CsrWifiSmeConnectionConfigGetCfm *p = (CsrWifiSmeConnectionConfigGetCfm *)message;
- CsrPmemFree(p->connectionConfig.mlmeAssociateReqInformationElements);
+ kfree(p->connectionConfig.mlmeAssociateReqInformationElements);
p->connectionConfig.mlmeAssociateReqInformationElements = NULL;
break;
}
case CSR_WIFI_SME_CONNECTION_INFO_GET_CFM:
{
CsrWifiSmeConnectionInfoGetCfm *p = (CsrWifiSmeConnectionInfoGetCfm *)message;
- CsrPmemFree(p->connectionInfo.beaconFrame);
+ kfree(p->connectionInfo.beaconFrame);
p->connectionInfo.beaconFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationReqFrame);
+ kfree(p->connectionInfo.associationReqFrame);
p->connectionInfo.associationReqFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationRspFrame);
+ kfree(p->connectionInfo.associationRspFrame);
p->connectionInfo.associationRspFrame = NULL;
- CsrPmemFree(p->connectionInfo.assocScanInfoElements);
+ kfree(p->connectionInfo.assocScanInfoElements);
p->connectionInfo.assocScanInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocReqInfoElements);
+ kfree(p->connectionInfo.assocReqInfoElements);
p->connectionInfo.assocReqInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocRspInfoElements);
+ kfree(p->connectionInfo.assocRspInfoElements);
p->connectionInfo.assocRspInfoElements = NULL;
break;
}
case CSR_WIFI_SME_MEDIA_STATUS_IND:
{
CsrWifiSmeMediaStatusInd *p = (CsrWifiSmeMediaStatusInd *)message;
- CsrPmemFree(p->connectionInfo.beaconFrame);
+ kfree(p->connectionInfo.beaconFrame);
p->connectionInfo.beaconFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationReqFrame);
+ kfree(p->connectionInfo.associationReqFrame);
p->connectionInfo.associationReqFrame = NULL;
- CsrPmemFree(p->connectionInfo.associationRspFrame);
+ kfree(p->connectionInfo.associationRspFrame);
p->connectionInfo.associationRspFrame = NULL;
- CsrPmemFree(p->connectionInfo.assocScanInfoElements);
+ kfree(p->connectionInfo.assocScanInfoElements);
p->connectionInfo.assocScanInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocReqInfoElements);
+ kfree(p->connectionInfo.assocReqInfoElements);
p->connectionInfo.assocReqInfoElements = NULL;
- CsrPmemFree(p->connectionInfo.assocRspInfoElements);
+ kfree(p->connectionInfo.assocRspInfoElements);
p->connectionInfo.assocRspInfoElements = NULL;
break;
}
case CSR_WIFI_SME_MIB_GET_CFM:
{
CsrWifiSmeMibGetCfm *p = (CsrWifiSmeMibGetCfm *)message;
- CsrPmemFree(p->mibAttribute);
+ kfree(p->mibAttribute);
p->mibAttribute = NULL;
break;
}
case CSR_WIFI_SME_MIB_GET_NEXT_CFM:
{
CsrWifiSmeMibGetNextCfm *p = (CsrWifiSmeMibGetNextCfm *)message;
- CsrPmemFree(p->mibAttribute);
+ kfree(p->mibAttribute);
p->mibAttribute = NULL;
break;
}
case CSR_WIFI_SME_MULTICAST_ADDRESS_CFM:
{
CsrWifiSmeMulticastAddressCfm *p = (CsrWifiSmeMulticastAddressCfm *)message;
- CsrPmemFree(p->getAddresses);
+ kfree(p->getAddresses);
p->getAddresses = NULL;
break;
}
case CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND:
{
CsrWifiSmePmkidCandidateListInd *p = (CsrWifiSmePmkidCandidateListInd *)message;
- CsrPmemFree(p->pmkidCandidates);
+ kfree(p->pmkidCandidates);
p->pmkidCandidates = NULL;
break;
}
case CSR_WIFI_SME_PMKID_CFM:
{
CsrWifiSmePmkidCfm *p = (CsrWifiSmePmkidCfm *)message;
- CsrPmemFree(p->getPmkids);
+ kfree(p->getPmkids);
p->getPmkids = NULL;
break;
}
case CSR_WIFI_SME_SCAN_CONFIG_GET_CFM:
{
CsrWifiSmeScanConfigGetCfm *p = (CsrWifiSmeScanConfigGetCfm *)message;
- CsrPmemFree(p->scanConfig.passiveChannelList);
+ kfree(p->scanConfig.passiveChannelList);
p->scanConfig.passiveChannelList = NULL;
break;
}
case CSR_WIFI_SME_SCAN_RESULT_IND:
{
CsrWifiSmeScanResultInd *p = (CsrWifiSmeScanResultInd *)message;
- CsrPmemFree(p->result.informationElements);
+ kfree(p->result.informationElements);
p->result.informationElements = NULL;
switch (p->result.p2pDeviceRole)
{
@@ -164,15 +164,15 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
u16 i4;
for (i4 = 0; i4 < p->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++)
{
- CsrPmemFree(p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
+ kfree(p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
}
}
- CsrPmemFree(p->result.deviceInfo.groupInfo.p2PClientInfo);
+ kfree(p->result.deviceInfo.groupInfo.p2PClientInfo);
p->result.deviceInfo.groupInfo.p2PClientInfo = NULL;
break;
case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
- CsrPmemFree(p->result.deviceInfo.standalonedevInfo.secDeviceType);
+ kfree(p->result.deviceInfo.standalonedevInfo.secDeviceType);
p->result.deviceInfo.standalonedevInfo.secDeviceType = NULL;
break;
default:
@@ -187,7 +187,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
u16 i1;
for (i1 = 0; i1 < p->scanResultsCount; i1++)
{
- CsrPmemFree(p->scanResults[i1].informationElements);
+ kfree(p->scanResults[i1].informationElements);
p->scanResults[i1].informationElements = NULL;
switch (p->scanResults[i1].p2pDeviceRole)
{
@@ -196,15 +196,15 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
u16 i4;
for (i4 = 0; i4 < p->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++)
{
- CsrPmemFree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
+ kfree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType);
p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
}
}
- CsrPmemFree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo);
+ kfree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo);
p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL;
break;
case CSR_WIFI_SME_P2P_ROLE_STANDALONE:
- CsrPmemFree(p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType);
+ kfree(p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType);
p->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL;
break;
default:
@@ -212,58 +212,58 @@ void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message)
}
}
}
- CsrPmemFree(p->scanResults);
+ kfree(p->scanResults);
p->scanResults = NULL;
break;
}
case CSR_WIFI_SME_TSPEC_IND:
{
CsrWifiSmeTspecInd *p = (CsrWifiSmeTspecInd *)message;
- CsrPmemFree(p->tspec);
+ kfree(p->tspec);
p->tspec = NULL;
break;
}
case CSR_WIFI_SME_TSPEC_CFM:
{
CsrWifiSmeTspecCfm *p = (CsrWifiSmeTspecCfm *)message;
- CsrPmemFree(p->tspec);
+ kfree(p->tspec);
p->tspec = NULL;
break;
}
case CSR_WIFI_SME_VERSIONS_GET_CFM:
{
CsrWifiSmeVersionsGetCfm *p = (CsrWifiSmeVersionsGetCfm *)message;
- CsrPmemFree(p->versions.routerBuild);
+ kfree(p->versions.routerBuild);
p->versions.routerBuild = NULL;
- CsrPmemFree(p->versions.smeBuild);
+ kfree(p->versions.smeBuild);
p->versions.smeBuild = NULL;
break;
}
case CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM:
{
CsrWifiSmeCloakedSsidsGetCfm *p = (CsrWifiSmeCloakedSsidsGetCfm *)message;
- CsrPmemFree(p->cloakedSsids.cloakedSsids);
+ kfree(p->cloakedSsids.cloakedSsids);
p->cloakedSsids.cloakedSsids = NULL;
break;
}
case CSR_WIFI_SME_ERROR_IND:
{
CsrWifiSmeErrorInd *p = (CsrWifiSmeErrorInd *)message;
- CsrPmemFree(p->errorMessage);
+ kfree(p->errorMessage);
p->errorMessage = NULL;
break;
}
case CSR_WIFI_SME_INFO_IND:
{
CsrWifiSmeInfoInd *p = (CsrWifiSmeInfoInd *)message;
- CsrPmemFree(p->infoMessage);
+ kfree(p->infoMessage);
p->infoMessage = NULL;
break;
}
case CSR_WIFI_SME_CORE_DUMP_IND:
{
CsrWifiSmeCoreDumpInd *p = (CsrWifiSmeCoreDumpInd *)message;
- CsrPmemFree(p->data);
+ kfree(p->data);
p->data = NULL;
break;
}