staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req
authorLeo Kim <leo.kim@atmel.com>
Thu, 29 Oct 2015 03:05:27 +0000 (12:05 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000 (20:02 -0800)
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>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index f1f1ef4b41570eac3ac08d1a69ef221eff39033a..3b24a27704e4aea2ef80d442c89840b9fa897ec4 100644 (file)
@@ -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");
                }
index 3afe4323072d4900a47219aefbbce47fee5c7f16..9595d488446bc09e2b96ce8ad3017f96a5ec0181 100644 (file)
@@ -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 {