OSDN Git Service

staging: wilc1000: rename pu8IEs of struct scan_attr
authorLeo Kim <leo.kim@atmel.com>
Tue, 13 Oct 2015 10:49:42 +0000 (19:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 16:55:08 +0000 (09:55 -0700)
This patch renames pu8IEs of struct scan_attr to ies to
avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index 205be22..4a33d16 100644 (file)
@@ -100,7 +100,7 @@ struct scan_attr {
        u8 type;
        u8 *ch_freq_list;
        u8 ch_list_len;
-       u8 *pu8IEs;
+       u8 *ies;
        size_t IEsLen;
        wilc_scan_result pfScanResult;
        void *pvUserArg;
@@ -891,7 +891,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
        {
                strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
                strWIDList[u32WidsCount].type = WID_BIN_DATA;
-               strWIDList[u32WidsCount].val = pstrHostIFscanAttr->pu8IEs;
+               strWIDList[u32WidsCount].val = pstrHostIFscanAttr->ies;
                strWIDList[u32WidsCount].size = pstrHostIFscanAttr->IEsLen;
                u32WidsCount++;
        }
@@ -948,9 +948,9 @@ ERRORHANDLER:
                pstrHostIFscanAttr->ch_freq_list = NULL;
        }
 
-       if (pstrHostIFscanAttr->pu8IEs != NULL) {
-               kfree(pstrHostIFscanAttr->pu8IEs);
-               pstrHostIFscanAttr->pu8IEs = NULL;
+       if (pstrHostIFscanAttr->ies != NULL) {
+               kfree(pstrHostIFscanAttr->ies);
+               pstrHostIFscanAttr->ies = NULL;
        }
        if (pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo != NULL) {
                kfree(pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo);
@@ -4067,9 +4067,8 @@ s32 host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource,
        memcpy(msg.body.scan_info.ch_freq_list, pu8ChnlFreqList, u8ChnlListLen);
 
        msg.body.scan_info.IEsLen = IEsLen;
-       msg.body.scan_info.pu8IEs = kmalloc(IEsLen, GFP_KERNEL);
-       memcpy(msg.body.scan_info.pu8IEs,
-                   pu8IEs, IEsLen);
+       msg.body.scan_info.ies = kmalloc(IEsLen, GFP_KERNEL);
+       memcpy(msg.body.scan_info.ies, pu8IEs, IEsLen);
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
        if (s32Error) {