From: Leo Kim <leo.kim@atmel.com>
Date: Thu, 29 Oct 2015 03:05:27 +0000 (+0900)
Subject: staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=73abaa4906ae8d90d558e053a6af4ff5df03109d;p=deliverable%2Flinux.git

staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req

This patch renames u32UserConnectPvoid of struct user_conn_req to arg
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index f1f1ef4b4157..3b24a27704e4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1030,7 +1030,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 	hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security;
 	hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type;
 	hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
-	hif_drv->usr_conn_req.u32UserConnectPvoid = pstrHostIFconnectAttr->arg;
+	hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
 
 	strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
 	strWIDList[u32WidsCount].type = WID_INT;
@@ -1351,7 +1351,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv)
 						  &strConnectInfo,
 						  MAC_DISCONNECTED,
 						  NULL,
-						  hif_drv->usr_conn_req.u32UserConnectPvoid);
+						  hif_drv->usr_conn_req.arg);
 
 		kfree(strConnectInfo.pu8ReqIEs);
 		strConnectInfo.pu8ReqIEs = NULL;
@@ -1599,7 +1599,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
 							  &strConnectInfo,
 							  u8MacStatus,
 							  NULL,
-							  hif_drv->usr_conn_req.u32UserConnectPvoid);
+							  hif_drv->usr_conn_req.arg);
 
 			if ((u8MacStatus == MAC_CONNECTED) &&
 			    (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE))	{
@@ -1652,7 +1652,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
 								  NULL,
 								  0,
 								  &strDisconnectNotifInfo,
-								  hif_drv->usr_conn_req.u32UserConnectPvoid);
+								  hif_drv->usr_conn_req.arg);
 			} else {
 				PRINT_ER("Connect result callback function is NULL\n");
 			}
@@ -2017,7 +2017,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
 							  NULL,
 							  0,
 							  &strDisconnectNotifInfo,
-							  hif_drv->usr_conn_req.u32UserConnectPvoid);
+							  hif_drv->usr_conn_req.arg);
 		} else {
 			PRINT_ER("usr_conn_req.conn_result = NULL\n");
 		}
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 3afe4323072d..9595d488446b 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -208,7 +208,7 @@ struct user_conn_req {
 	size_t ies_len;
 	wilc_connect_result conn_result;
 	bool ht_capable;
-	void *u32UserConnectPvoid;
+	void *arg;
 };
 
 struct drv_handler {