From: Leo Kim <leo.kim@atmel.com>
Date: Tue, 13 Oct 2015 10:49:55 +0000 (+0900)
Subject: staging: wilc1000: rename pfConnectResult of struct connect_attr
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6abcc11dba58e954d3d1a9d3f9722c4358712f08;p=linux-beck.git

staging: wilc1000: rename pfConnectResult of struct connect_attr

This patch renames pfConnectResult of struct connect_attr to result 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>
---

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6e5db9d3002a..fc82d4617212 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -114,7 +114,7 @@ struct connect_attr {
 	u8 *ies;
 	size_t ies_len;
 	u8 security;
-	wilc_connect_result pfConnectResult;
+	wilc_connect_result result;
 	void *pvUserArg;
 	enum AUTHTYPE tenuAuth_type;
 	u8 u8channel;
@@ -1053,7 +1053,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 
 	hif_drv->strWILC_UsrConnReq.u8security = pstrHostIFconnectAttr->security;
 	hif_drv->strWILC_UsrConnReq.tenuAuth_type = pstrHostIFconnectAttr->tenuAuth_type;
-	hif_drv->strWILC_UsrConnReq.pfUserConnectResult = pstrHostIFconnectAttr->pfConnectResult;
+	hif_drv->strWILC_UsrConnReq.pfUserConnectResult = pstrHostIFconnectAttr->result;
 	hif_drv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
 
 	strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
@@ -1258,7 +1258,7 @@ ERRORHANDLER:
 
 		memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
 
-		if (pstrHostIFconnectAttr->pfConnectResult != NULL) {
+		if (pstrHostIFconnectAttr->result != NULL) {
 			if (pstrHostIFconnectAttr->bssid != NULL)
 				memcpy(strConnectInfo.au8bssid, pstrHostIFconnectAttr->bssid, 6);
 
@@ -1270,7 +1270,7 @@ ERRORHANDLER:
 					    pstrHostIFconnectAttr->ies_len);
 			}
 
-			pstrHostIFconnectAttr->pfConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
+			pstrHostIFconnectAttr->result(CONN_DISCONN_EVENT_CONN_RESP,
 							       &strConnectInfo,
 							       MAC_DISCONNECTED,
 							       NULL,
@@ -3614,7 +3614,7 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
 	msg.body.con_info.security = u8security;
 	msg.body.con_info.tenuAuth_type = tenuAuth_type;
 	msg.body.con_info.u8channel = u8channel;
-	msg.body.con_info.pfConnectResult = pfConnectResult;
+	msg.body.con_info.result = pfConnectResult;
 	msg.body.con_info.pvUserArg = pvUserArg;
 	msg.body.con_info.pJoinParams = pJoinParams;
 	msg.drv = hif_drv ;