staging: wilc1000: coreconfigurator.c: use kmalloc instead of WILC_MALLOC

[deliverable/linux.git] / drivers / staging / wilc1000 / coreconfigurator.c

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 5bb1b1550f98e5f12dc77afeabb178b65100b31f..fd899140b16f6b4a96336a8128a638168db43fab 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -167,7 +167,6 @@ extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);
 static struct semaphore SemHandleSendPkt;
 static struct semaphore SemHandlePktResp;
 
-static s8 *gps8ConfigPacket;
 
 static tstrConfigPktInfo gstrConfigPktInfo;
 
@@ -674,17 +673,8 @@ s32 CoreConfiguratorInit(void)
        sema_init(&SemHandleSendPkt, 1);
        sema_init(&SemHandlePktResp, 0);
 
-       gps8ConfigPacket = (s8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE);
-       if (gps8ConfigPacket == NULL) {
-               PRINT_ER("failed in gps8ConfigPacket allocation\n");
-               s32Error = WILC_NO_MEM;
-               goto _fail_;
-       }
-
-       memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE);
 
        memset((void *)(&gstrConfigPktInfo), 0, sizeof(tstrConfigPktInfo));
-_fail_:
        return s32Error;
 }
 
@@ -810,7 +800,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
                u32 u32Tsf_Lo;
                u32 u32Tsf_Hi;
 
-               pstrNetworkInfo = (tstrNetworkInfo *)WILC_MALLOC(sizeof(tstrNetworkInfo));
+               pstrNetworkInfo = kmalloc(sizeof(tstrNetworkInfo), GFP_KERNEL);
                memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));
 
                pstrNetworkInfo->s8rssi = pu8WidVal[0];
@@ -860,7 +850,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
                u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
 
                if (u16IEsLen > 0) {
-                       pstrNetworkInfo->pu8IEs = (u8 *)WILC_MALLOC(u16IEsLen);
+                       pstrNetworkInfo->pu8IEs = kmalloc(u16IEsLen, GFP_KERNEL);
                        memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);
 
                        memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
@@ -891,13 +881,13 @@ s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)
 
        if (pstrNetworkInfo != NULL) {
                if (pstrNetworkInfo->pu8IEs != NULL) {
-                       WILC_FREE(pstrNetworkInfo->pu8IEs);
+                       kfree(pstrNetworkInfo->pu8IEs);
                        pstrNetworkInfo->pu8IEs = NULL;
                } else {
                        s32Error = WILC_FAIL;
                }
 
-               WILC_FREE(pstrNetworkInfo);
+               kfree(pstrNetworkInfo);
                pstrNetworkInfo = NULL;
 
        } else {
@@ -927,7 +917,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
        u8 *pu8IEs = 0;
        u16 u16IEsLen = 0;
 
-       pstrConnectRespInfo = (tstrConnectRespInfo *)WILC_MALLOC(sizeof(tstrConnectRespInfo));
+       pstrConnectRespInfo = kmalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
        memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));
 
        /* u16AssocRespLen = pu8Buffer[0]; */
@@ -947,7 +937,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
                pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
                u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
 
-               pstrConnectRespInfo->pu8RespIEs = (u8 *)WILC_MALLOC(u16IEsLen);
+               pstrConnectRespInfo->pu8RespIEs = kmalloc(u16IEsLen, GFP_KERNEL);
                memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
 
                memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
@@ -976,13 +966,13 @@ s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
 
        if (pstrConnectRespInfo != NULL) {
                if (pstrConnectRespInfo->pu8RespIEs != NULL) {
-                       WILC_FREE(pstrConnectRespInfo->pu8RespIEs);
+                       kfree(pstrConnectRespInfo->pu8RespIEs);
                        pstrConnectRespInfo->pu8RespIEs = NULL;
                } else {
                        s32Error = WILC_FAIL;
                }
 
-               WILC_FREE(pstrConnectRespInfo);
+               kfree(pstrConnectRespInfo);
                pstrConnectRespInfo = NULL;
 
        } else {
@@ -1016,7 +1006,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
                }
        }
 
-       pstrSurveyResults = (wid_site_survey_reslts_s *)WILC_MALLOC(u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));
+       pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
+                               sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
        if (pstrSurveyResults == NULL) {
                u32SurveyResultsCount = 0;
                WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
@@ -1056,7 +1047,7 @@ s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults)
        s32 s32Error = WILC_SUCCESS;
 
        if (pstrSurveyResults != NULL) {
-               WILC_FREE(pstrSurveyResults);
+               kfree(pstrSurveyResults);
        }
 
        return s32Error;
@@ -1438,8 +1429,6 @@ void ProcessAdrWid(char *pcPacket, s32 *ps32PktLen,
 void ProcessBinWid(char *pcPacket, s32 *ps32PktLen,
                   tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
 {
-       /* WILC_ERROR("processing Binary WIDs is not supported\n"); */
-
        u16 u16MsgLen = 0;
        u16 idx    = 0;
        s32 s32PktLen = *ps32PktLen;
@@ -1956,11 +1945,6 @@ s32 CoreConfiguratorDeInit(void)
 
        PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit()\n");
 
-       if (gps8ConfigPacket != NULL) {
-
-               WILC_FREE(gps8ConfigPacket);
-               gps8ConfigPacket = NULL;
-       }
 
        return s32Error;
 }
@@ -2014,7 +1998,6 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
                /**
                 *      get the value
                 **/
-               /* WILC_Sleep(1000); */
                counter = 0;
                for (counter = 0; counter < u32WIDsCount; counter++) {
                        pstrWIDs[counter].s32ValueSize = gpstrWlanOps->wlan_cfg_get_value(