]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: rename pvUserArg of struct connect_attr
authorLeo Kim <leo.kim@atmel.com>
Tue, 13 Oct 2015 10:49:56 +0000 (19:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 16:55:08 +0000 (09:55 -0700)
This patch renames pvUserArg of struct connect_attr to arg 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 fc82d4617212d8bbab349a72a0b9ebd48f52415c..0790dcb77fb89d5688a5e0d567ea5ae87ed3bc2e 100644 (file)
@@ -115,7 +115,7 @@ struct connect_attr {
        size_t ies_len;
        u8 security;
        wilc_connect_result result;
-       void *pvUserArg;
+       void *arg;
        enum AUTHTYPE tenuAuth_type;
        u8 u8channel;
        void *pJoinParams;
@@ -1054,7 +1054,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->result;
-       hif_drv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
+       hif_drv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->arg;
 
        strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
        strWIDList[u32WidsCount].type = WID_INT;
@@ -1274,7 +1274,7 @@ ERRORHANDLER:
                                                               &strConnectInfo,
                                                               MAC_DISCONNECTED,
                                                               NULL,
-                                                              pstrHostIFconnectAttr->pvUserArg);
+                                                              pstrHostIFconnectAttr->arg);
                        hif_drv->enuHostIFstate = HOST_IF_IDLE;
                        if (strConnectInfo.pu8ReqIEs != NULL) {
                                kfree(strConnectInfo.pu8ReqIEs);
@@ -3615,7 +3615,7 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
        msg.body.con_info.tenuAuth_type = tenuAuth_type;
        msg.body.con_info.u8channel = u8channel;
        msg.body.con_info.result = pfConnectResult;
-       msg.body.con_info.pvUserArg = pvUserArg;
+       msg.body.con_info.arg = pvUserArg;
        msg.body.con_info.pJoinParams = pJoinParams;
        msg.drv = hif_drv ;