UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath6kl: s|A_FREE|kfree|g 

for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \
	sed -r -i -e "s/A_FREE/kfree/g" $i; done

Tested-by: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Luis R. Rodriguez 2011-03-29 17:55:58 -07:00 committed by Greg Kroah-Hartman
parent 1fec95c503
commit ab8911150f
18 changed files with 71 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/ath6kl/bmi/src/bmi.c
View File

@ -95,12 +95,12 @@ void
BMICleanup(void)
{
if (pBMICmdCredits) {
A_FREE(pBMICmdCredits);
kfree(pBMICmdCredits);
pBMICmdCredits = NULL;
}
if (pBMICmdBuf) {
A_FREE(pBMICmdBuf);
kfree(pBMICmdBuf);
pBMICmdBuf = NULL;
}
}
@ -127,12 +127,12 @@ BMIDone(struct hif_device *device)
}
if (pBMICmdCredits) {
A_FREE(pBMICmdCredits);
kfree(pBMICmdCredits);
pBMICmdCredits = NULL;
}
if (pBMICmdBuf) {
A_FREE(pBMICmdBuf);
kfree(pBMICmdBuf);
pBMICmdBuf = NULL;
}

10
drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
View File

@ -309,7 +309,7 @@ int SetupHIFScatterSupport(struct hif_device *device, struct hif_device_scatter_
(MAX_SCATTER_ENTRIES_PER_REQ - 1) * (sizeof(struct hif_scatter_item)));
if (NULL == pReqPriv->pHifScatterReq) {
A_FREE(pReqPriv);
kfree(pReqPriv);
break;
}
/* just zero the main part of the scatter request */
@ -319,8 +319,8 @@ int SetupHIFScatterSupport(struct hif_device *device, struct hif_device_scatter_
/* allocate a bus request for this scatter request */
busrequest = hifAllocateBusRequest(device);
if (NULL == busrequest) {
A_FREE(pReqPriv->pHifScatterReq);
A_FREE(pReqPriv);
kfree(pReqPriv->pHifScatterReq);
kfree(pReqPriv);
break;
}
/* assign the scatter request to this bus request */
@ -382,11 +382,11 @@ void CleanupHIFScatterResources(struct hif_device *device)
}
if (pReqPriv->pHifScatterReq != NULL) {
A_FREE(pReqPriv->pHifScatterReq);
kfree(pReqPriv->pHifScatterReq);
pReqPriv->pHifScatterReq = NULL;
}
A_FREE(pReqPriv);
kfree(pReqPriv);
}
}

2
drivers/staging/ath6kl/htc2/AR6000/ar6k.c
View File

@ -743,7 +743,7 @@ static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev)
if (NULL == pReq) {
break;
}
A_FREE(pReq);
kfree(pReq);
}
}

2
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
View File

@ -108,7 +108,7 @@ static void HCIUartCleanup(struct gmbox_proto_hci_uart *pProtocol)
A_MUTEX_DELETE(&pProtocol->HCIRxLock);
A_MUTEX_DELETE(&pProtocol->HCITxLock);
A_FREE(pProtocol);
kfree(pProtocol);
}
static int InitTxCreditState(struct gmbox_proto_hci_uart *pProt)

4
drivers/staging/ath6kl/htc2/htc.c
View File

@ -70,7 +70,7 @@ static void HTCCleanup(struct htc_target *target)
for (i = 0;i < NUM_CONTROL_BUFFERS;i++) {
if (target->HTCControlBuffers[i].Buffer) {
A_FREE(target->HTCControlBuffers[i].Buffer);
kfree(target->HTCControlBuffers[i].Buffer);
}
}
@ -86,7 +86,7 @@ static void HTCCleanup(struct htc_target *target)
A_MUTEX_DELETE(&target->HTCTxLock);
}
/* free our instance */
A_FREE(target);
kfree(target);
}
/* registered target arrival callback from the HIF layer */

22
drivers/staging/ath6kl/miscdrv/ar3kconfig.c
View File

@ -78,7 +78,7 @@ static int SendHCICommand(struct ar3k_config_info *pConfig,
} while (false);
if (pPacket != NULL) {
A_FREE(pPacket);
kfree(pPacket);
}
return status;
@ -116,7 +116,7 @@ static int RecvHCIEvent(struct ar3k_config_info *pConfig,
} while (false);
if (pRecvPacket != NULL) {
A_FREE(pRecvPacket);
kfree(pRecvPacket);
}
return status;
@ -203,7 +203,7 @@ int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig,
} while (false);
if (pBuffer != NULL) {
A_FREE(pBuffer);
kfree(pBuffer);
}
return status;
@ -268,7 +268,7 @@ static int AR3KConfigureHCIBaud(struct ar3k_config_info *pConfig)
} while (false);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
return status;
@ -304,7 +304,7 @@ static int AR3KExitMinBoot(struct ar3k_config_info *pConfig)
}
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
return status;
@ -328,7 +328,7 @@ static int AR3KConfigureSendHCIReset(struct ar3k_config_info *pConfig)
}
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
return status;
@ -382,7 +382,7 @@ static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
&pEvent,
&pBufferToFree);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HostWakeup Config Failed! \n"));
@ -397,7 +397,7 @@ static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
&pEvent,
&pBufferToFree);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Target Wakeup Config Failed! \n"));
@ -412,7 +412,7 @@ static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
&pEvent,
&pBufferToFree);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HostWakeup Enable Failed! \n"));
@ -427,7 +427,7 @@ static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
&pEvent,
&pBufferToFree);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Target Wakeup Enable Failed! \n"));
@ -442,7 +442,7 @@ static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
&pEvent,
&pBufferToFree);
if (pBufferToFree != NULL) {
A_FREE(pBufferToFree);
kfree(pBufferToFree);
}
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Sleep Enable Failed! \n"));

22
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
View File

@ -222,7 +222,7 @@ int PSSendOps(void *arg)
A_RELEASE_FIRMWARE(firmware);
/* Parse the PS buffer to a global variable */
status = AthDoParsePS(buffer,len);
A_FREE(buffer);
kfree(buffer);
} else {
A_RELEASE_FIRMWARE(firmware);
}
@ -256,7 +256,7 @@ int PSSendOps(void *arg)
A_RELEASE_FIRMWARE(firmware);
/* parse and store the Patch file contents to a global variables */
status = AthDoParsePatch(buffer,len);
A_FREE(buffer);
kfree(buffer);
} else {
A_RELEASE_FIRMWARE(firmware);
}
@ -283,7 +283,7 @@ int PSSendOps(void *arg)
&bufferToFree) == 0) {
if(ReadPSEvent(event) == 0) { /* Exit if the status is success */
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
#ifndef HCI_TRANSPORT_SDIO
@ -295,7 +295,7 @@ int PSSendOps(void *arg)
goto complete;
}
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
} else {
status = 0;
@ -312,13 +312,13 @@ int PSSendOps(void *arg)
&bufferToFree) == 0) {
if(ReadPSEvent(event) != 0) { /* Exit if the status is success */
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
status = 1;
goto complete;
}
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
} else {
status = 0;
@ -376,10 +376,10 @@ complete:
AthFreeCommandList(&HciCmdList,numCmds);
}
if(path) {
A_FREE(path);
kfree(path);
}
if(config_path) {
A_FREE(config_path);
kfree(config_path);
}
return status;
}
@ -511,7 +511,7 @@ int write_bdaddr(struct ar3k_config_info *pConfig,u8 *bdaddr,int type)
}
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
return result;
@ -527,7 +527,7 @@ int ReadVersionInfo(struct ar3k_config_info *pConfig)
}
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
return result;
}
@ -564,7 +564,7 @@ int getDeviceType(struct ar3k_config_info *pConfig, u32 *code)
}
if(bufferToFree != NULL) {
A_FREE(bufferToFree);
kfree(bufferToFree);
}
return result;
}

28
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
View File

@ -362,7 +362,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("error\n"));
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -401,7 +401,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
if(uGetInputDataFormat(pCharLine, &stPS_DataFormat)) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("uGetInputDataFormat fail\n"));
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -422,7 +422,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
if(uGetInputDataFormat(pCharLine, &stPS_DataFormat)) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("uGetInputDataFormat fail \n"));
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -433,7 +433,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
if (ByteCount > LINE_SIZE_MAX/2)
{
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -449,7 +449,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
if(uGetInputDataFormat(pCharLine,&stPS_DataFormat)) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("uGetInputDataFormat Fail\n"));
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -510,7 +510,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("\n Buffer over flow PS File too big!!!"));
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
//Sleep (3000);
@ -524,7 +524,7 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
default:
{
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
@ -541,13 +541,13 @@ int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
{
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return A_ERROR;
}
if(Buffer != NULL) {
A_FREE(Buffer);
kfree(Buffer);
}
return 0;
@ -609,7 +609,7 @@ int AthDoParsePatch(u8 *patchbuffer, u32 patchlen)
/* Handle case when the number of patch buffer is more than the 20K */
if(MAX_NUM_PATCH_ENTRY == Patch_Count) {
for(i = 0; i < Patch_Count; i++) {
A_FREE(RamPatch[i].Data);
kfree(RamPatch[i].Data);
}
return A_ERROR;
}
@ -812,13 +812,13 @@ int AthCreateCommandList(struct ps_cmd_packet **HciPacketList, u32 *numPackets)
for(count = 0; count < Patch_Count; count++) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Freeing Patch Buffer %d \r\n",count));
A_FREE(RamPatch[Patch_Count].Data);
kfree(RamPatch[Patch_Count].Data);
}
for(count = 0; count < Tag_Count; count++) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Freeing PS Buffer %d \r\n",count));
A_FREE(PsTagEntry[count].TagData);
kfree(PsTagEntry[count].TagData);
}
/*
@ -962,8 +962,8 @@ int AthFreeCommandList(struct ps_cmd_packet **HciPacketList, u32 numPackets)
return A_ERROR;
}
for(i = 0; i < numPackets;i++) {
A_FREE((*HciPacketList)[i].Hcipacket);
kfree((*HciPacketList)[i].Hcipacket);
}
A_FREE(*HciPacketList);
kfree(*HciPacketList);
return 0;
}

5
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
View File

@ -60,11 +60,6 @@
#ifndef A_MALLOC
#define A_MALLOC(size) kmalloc((size),GFP_KERNEL)
#endif /* A_MALLOC */
#ifndef A_FREE
#define A_FREE(addr) kfree((addr))
#endif /* A_MALLOC */
#endif /* HCI_TRANSPORT_UART */
/* String manipulation APIs */

10
drivers/staging/ath6kl/os/linux/ar6000_drv.c
View File

@ -982,7 +982,7 @@ ar6000_softmac_update(struct ar6_softc *ar, u8 *eeprom_data, size_t size)
}
source = "softmac file";
}
A_FREE(macbuf);
kfree(macbuf);
}
A_RELEASE_FIRMWARE(softmac_entry);
}
@ -2134,7 +2134,7 @@ ar6000_destroy(struct net_device *dev, unsigned int unregister)
#ifdef HTC_RAW_INTERFACE
if (ar->arRawHtc) {
A_FREE(ar->arRawHtc);
kfree(ar->arRawHtc);
ar->arRawHtc = NULL;
}
#endif
@ -4883,7 +4883,7 @@ ar6000_neighborReport_event(struct ar6_softc *ar, int numAps, WMI_NEIGHBOR_INFO
memcpy(pmkcand->bssid.sa_data, info->bssid, ATH_MAC_LEN);
wrqu.data.length = sizeof(struct iw_pmkid_cand);
wireless_send_event(ar->arNetDev, IWEVPMKIDCAND, &wrqu, (char *)pmkcand);
A_FREE(pmkcand);
kfree(pmkcand);
#else /* WIRELESS_EXT >= 18 */
snprintf(buf, sizeof(buf), "%s%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
tag,
@ -5603,7 +5603,7 @@ void ar6000_send_event_to_app(struct ar6_softc *ar, u16 eventId,
A_MEMZERO(&wrqu, sizeof(wrqu));
wrqu.data.length = size;
wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
A_FREE(buf);
kfree(buf);
#endif
@ -5648,7 +5648,7 @@ void ar6000_send_generic_event_to_app(struct ar6_softc *ar, u16 eventId,
wrqu.data.length = size;
wireless_send_event(ar->arNetDev, IWEVGENIE, &wrqu, buf);
A_FREE(buf);
kfree(buf);
#endif /* (WIRELESS_EXT >= 18) */

2
drivers/staging/ath6kl/os/linux/ar6k_pal.c
View File

@ -318,7 +318,7 @@ void ar6k_cleanup_hci_pal(void *ar_p)
if (pHciPalInfo != NULL) {
bt_cleanup_hci_pal(pHciPalInfo);
A_FREE(pHciPalInfo);
kfree(pHciPalInfo);
ar->hcipal_info = NULL;
}
}

4
drivers/staging/ath6kl/os/linux/cfg80211.c
View File

@ -552,7 +552,7 @@ ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
ibss_channel, mgmt,
le16_to_cpu(size),
signal, GFP_KERNEL);
A_FREE(ieeemgmtbuf);
kfree(ieeemgmtbuf);
cfg80211_put_bss(bss);
}
@ -729,7 +729,7 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
le16_to_cpu(size),
signal, GFP_KERNEL);
A_FREE (ieeemgmtbuf);
kfree (ieeemgmtbuf);
}
static int

4
drivers/staging/ath6kl/os/linux/hci_bridge.c
View File

@ -582,11 +582,11 @@ void ar6000_cleanup_hci(struct ar6_softc *ar)
}
if (pHcidevInfo->pHTCStructAlloc != NULL) {
A_FREE(pHcidevInfo->pHTCStructAlloc);
kfree(pHcidevInfo->pHTCStructAlloc);
pHcidevInfo->pHTCStructAlloc = NULL;
}
A_FREE(pHcidevInfo);
kfree(pHcidevInfo);
#ifndef EXPORT_HCI_BRIDGE_INTERFACE
ar->hcidev_info = NULL;
#endif

2
drivers/staging/ath6kl/os/linux/include/osapi_linux.h
View File

@ -79,7 +79,6 @@
#define A_MEMZERO(addr, len) memset(addr, 0, len)
#define A_MALLOC(size) kmalloc((size), GFP_KERNEL)
#define A_MALLOC_NOWAIT(size) kmalloc((size), GFP_ATOMIC)
#define A_FREE(addr) kfree(addr)
#if defined(ANDROID_ENV) && defined(CONFIG_ANDROID_LOGGER)
extern unsigned int enablelogcat;
@ -364,7 +363,6 @@ static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {
#define A_MEMZERO(addr, len) memset((addr), 0, (len))
#define A_MALLOC(size) malloc(size)
#define A_FREE(addr) free(addr)
#ifdef ANDROID
#ifndef err

8
drivers/staging/ath6kl/os/linux/ioctl.c
View File

@ -2132,7 +2132,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (copy_to_user(rq->ifr_data, buffer, length)) {
ret = -EFAULT;
}
A_FREE(buffer);
kfree(buffer);
} else {
ret = -ENOMEM;
}
@ -2155,7 +2155,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} else {
ret = BMIWriteMemory(hifDevice, address, buffer, length);
}
A_FREE(buffer);
kfree(buffer);
} else {
ret = -ENOMEM;
}
@ -2308,7 +2308,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} else {
ret = BMILZData(hifDevice, buffer, length);
}
A_FREE(buffer);
kfree(buffer);
} else {
ret = -ENOMEM;
}
@ -3822,7 +3822,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ret = BMIrompatchDeactivate(hifDevice, rompatch_count, (u32 *)buffer);
}
}
A_FREE(buffer);
kfree(buffer);
} else {
ret = -ENOMEM;
}

6
drivers/staging/ath6kl/reorder/rcv_aggr.c
View File

@ -123,7 +123,7 @@ aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid)
rxtid->hold_q_sz = 0;
if(rxtid->hold_q) {
A_FREE(rxtid->hold_q);
kfree(rxtid->hold_q);
rxtid->hold_q = NULL;
}
@ -154,7 +154,7 @@ aggr_module_destroy(void *cntxt)
A_NETBUF_FREE(rxtid->hold_q[k].osbuf);
}
}
A_FREE(rxtid->hold_q);
kfree(rxtid->hold_q);
}
/* Free the dispatch q contents*/
while(A_NETBUF_QUEUE_SIZE(&rxtid->q)) {
@ -168,7 +168,7 @@ aggr_module_destroy(void *cntxt)
while(A_NETBUF_QUEUE_SIZE(&p_aggr->freeQ)) {
A_NETBUF_FREE(A_NETBUF_DEQUEUE(&p_aggr->freeQ));
}
A_FREE(p_aggr);
kfree(p_aggr);
}
A_PRINTF("out aggr_module_destroy\n");
}

6
drivers/staging/ath6kl/wlan/src/wlan_node.c
View File

@ -72,7 +72,7 @@ wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size)
{
ni->ni_buf = A_MALLOC_NOWAIT(wh_size);
if (ni->ni_buf == NULL) {
A_FREE(ni);
kfree(ni);
ni = NULL;
return ni;
}
@ -104,9 +104,9 @@ void
wlan_node_free(bss_t *ni)
{
if (ni->ni_buf != NULL) {
A_FREE(ni->ni_buf);
kfree(ni->ni_buf);
}
A_FREE(ni);
kfree(ni);
}
void

4
drivers/staging/ath6kl/wmi/wmi.c
View File

@ -381,7 +381,7 @@ wmi_shutdown(struct wmi_t *wmip)
A_MUTEX_DELETE(&wmip->wmi_lock);
#endif
}
A_FREE(wmip);
kfree(wmip);
}
}
@ -5877,7 +5877,7 @@ wmi_scan_indication (struct wmi_t *wmip)
ar6000_scan_indication (wmip->wmi_devt, pAr6kScanIndEvent, size);
A_FREE(pAr6kScanIndEvent);
kfree(pAr6kScanIndEvent);
}
#endif