staging: wilc1000: rename struct tstrConnectInfo

This patch renames struct tstrConnectInfo to connect_info to avoid
camelcase and removes typedef.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 748199d4439aca0bafb69de9ef6a842f9c0f8911..0f39bc85b12653e54c907eecac25ac3cf50249ea 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -105,14 +105,14 @@ struct connect_resp_info {
        u16 ies_len;
 };
 
-typedef struct {
+struct connect_info {
        u8 au8bssid[6];
        u8 *pu8ReqIEs;
        size_t ReqIEsLen;
        u8 *pu8RespIEs;
        u16 u16RespIEsLen;
        u16 u16ConnectStatus;
-} tstrConnectInfo;
+};
 
 typedef struct {
        u16 u16reason;

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2ace069c47b70c2bdbbf0c0016c15d64b60ca85d..b093304a783b03d56fca9248254f2a606e7ff606 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1147,11 +1147,11 @@ static s32 Handle_Connect(struct wilc_vif *vif,
 
 ERRORHANDLER:
        if (result) {
-               tstrConnectInfo strConnectInfo;
+               struct connect_info strConnectInfo;
 
                del_timer(&hif_drv->connect_timer);
 
-               memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
+               memset(&strConnectInfo, 0, sizeof(struct connect_info));
 
                if (pstrHostIFconnectAttr->result) {
                        if (pstrHostIFconnectAttr->bssid)
@@ -1242,7 +1242,7 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif)
 static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
 {
        s32 result = 0;
-       tstrConnectInfo strConnectInfo;
+       struct connect_info strConnectInfo;
        struct wid wid;
        u16 u16DummyReasonCode = 0;
        struct host_if_drv *hif_drv = vif->hif_drv;
@@ -1256,7 +1256,7 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
 
        scan_while_connected = false;
 
-       memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
+       memset(&strConnectInfo, 0, sizeof(struct connect_info));
 
        if (hif_drv->usr_conn_req.conn_result) {
                if (hif_drv->usr_conn_req.bssid) {
@@ -1410,7 +1410,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
        u8 u8MacStatus;
        u8 u8MacStatusReasonCode;
        u8 u8MacStatusAdditionalInfo;
-       tstrConnectInfo strConnectInfo;
+       struct connect_info strConnectInfo;
        tstrDisconnectNotifInfo strDisconnectNotifInfo;
        s32 s32Err = 0;
        struct host_if_drv *hif_drv = vif->hif_drv;
@@ -1447,7 +1447,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                        u32 u32RcvdAssocRespInfoLen = 0;
                        struct connect_resp_info *pstrConnectRespInfo = NULL;
 
-                       memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
+                       memset(&strConnectInfo, 0, sizeof(struct connect_info));
 
                        if (u8MacStatus == MAC_CONNECTED) {
                                memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index f70ad7a69290768f8d611ebd8610999d24e93cd5..f4a3e4f892d63dbbd0f0d7ce9abace7c0ff07517 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -172,7 +172,7 @@ typedef void (*wilc_scan_result)(enum scan_event, struct network_info *,
                                 void *, void *);
 
 typedef void (*wilc_connect_result)(enum conn_event,
-                                    tstrConnectInfo *,
+                                    struct connect_info *,
                                     u8,
                                     tstrDisconnectNotifInfo *,
                                     void *);

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5aaceec252d6c238ffbe72027b77a161e480ce84..f6838c65b759ea0b3a36cb4469b597e0da0c3662 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -479,7 +479,7 @@ static void CfgScanResult(enum scan_event scan_event,
 int wilc_connecting;
 
 static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
-                            tstrConnectInfo *pstrConnectInfo,
+                            struct connect_info *pstrConnectInfo,
                             u8 u8MacStatus,
                             tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
                             void *pUserVoid)