[PATCH V2 29/40] staging: wilc1000: rename variable gu8FlushedInfoElemAsoc

Tony Cho tony.cho at atmel.com
Fri Oct 16 04:37:59 UTC 2015


From: Leo Kim <leo.kim at atmel.com>

This patch renames variable gu8FlushedInfoElemAsoc to info_element
to avoid CamelCase naming convention.

Add to static because follow warning reported by kbuild system.
- drivers/staging/wilc1000/host_interface.c:268:5: sparse: symbol
  'info_element' was not declared. Should it be static?

Signed-off-by: Leo Kim <leo.kim at atmel.com>
Signed-off-by: Tony Cho <tony.cho at atmel.com>
---
 drivers/staging/wilc1000/host_interface.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a97583a..db63886 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -262,7 +262,7 @@ static u32 inactive_time;
 static u8 del_beacon;
 
 static u8 *join_req;
-u8 *gu8FlushedInfoElemAsoc;
+static u8 *info_element;
 u8 gu8Flushed11iMode;
 u8 gu8FlushedAuthType;
 u32 gu32FlushedJoinReqSize;
@@ -1076,8 +1076,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 		if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
 
 			gu32FlushedInfoElemAsocSize = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
-			gu8FlushedInfoElemAsoc =  kmalloc(gu32FlushedInfoElemAsocSize, GFP_KERNEL);
-			memcpy(gu8FlushedInfoElemAsoc, hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs,
+			info_element = kmalloc(gu32FlushedInfoElemAsocSize, GFP_KERNEL);
+			memcpy(info_element, hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs,
 			       gu32FlushedInfoElemAsocSize);
 		}
 	}
@@ -1302,7 +1302,7 @@ static s32 Handle_FlushConnect(struct host_if_drv *hif_drv)
 
 	strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
 	strWIDList[u32WidsCount].type = WID_BIN_DATA;
-	strWIDList[u32WidsCount].val = gu8FlushedInfoElemAsoc;
+	strWIDList[u32WidsCount].val = info_element;
 	strWIDList[u32WidsCount].size = gu32FlushedInfoElemAsocSize;
 	u32WidsCount++;
 
@@ -1411,9 +1411,10 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv)
 		kfree(join_req);
 		join_req = NULL;
 	}
-	if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
-		kfree(gu8FlushedInfoElemAsoc);
-		gu8FlushedInfoElemAsoc = NULL;
+
+	if (info_element != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
+		kfree(info_element);
+		info_element = NULL;
 	}
 
 	return s32Error;
@@ -1714,9 +1715,10 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
 				kfree(join_req);
 				join_req = NULL;
 			}
-			if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
-				kfree(gu8FlushedInfoElemAsoc);
-				gu8FlushedInfoElemAsoc = NULL;
+
+			if (info_element != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
+				kfree(info_element);
+				info_element = NULL;
 			}
 
 			hif_drv->enuHostIFstate = HOST_IF_IDLE;
@@ -2106,9 +2108,10 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
 			kfree(join_req);
 			join_req = NULL;
 		}
-		if (gu8FlushedInfoElemAsoc != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
-			kfree(gu8FlushedInfoElemAsoc);
-			gu8FlushedInfoElemAsoc = NULL;
+
+		if (info_element != NULL && gu8FlushedJoinReqDrvHandler == hif_drv) {
+			kfree(info_element);
+			info_element = NULL;
 		}
 
 	}
-- 
1.9.1



More information about the devel mailing list