staging: wilc1000: rename struct tstrDisconnectNotifInfo

This patch renames struct tstrDisconnectNotifInfo to disconnect_info to
avoid camelcase.

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 9fbd52b1ea3078f90c4acaf369cef8113fabacc1..6256d7198546ef93b467836ea0e718a0441b61db 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -114,11 +114,11 @@ struct connect_info {
        u16 status;
 };
 
-typedef struct {
+struct disconnect_info {
        u16 u16reason;
        u8 *ie;
        size_t ie_len;
-} tstrDisconnectNotifInfo;
+};
 
 s32 wilc_parse_network_info(u8 *msg_buffer,
                            struct network_info **ret_network_info);

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 1ebe08a2739061d3cb1c5b31cf8ea25e434c0276..4cdd3403e24911a1f390eb702309ab9c58b43b9a 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1411,7 +1411,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
        u8 u8MacStatusReasonCode;
        u8 u8MacStatusAdditionalInfo;
        struct connect_info strConnectInfo;
-       tstrDisconnectNotifInfo strDisconnectNotifInfo;
+       struct disconnect_info strDisconnectNotifInfo;
        s32 s32Err = 0;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
@@ -1545,7 +1545,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                        hif_drv->usr_conn_req.ies = NULL;
                } else if ((u8MacStatus == MAC_DISCONNECTED) &&
                           (hif_drv->hif_state == HOST_IF_CONNECTED)) {
-                       memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo));
+                       memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info));
 
                        if (hif_drv->usr_scan_req.scan_result) {
                                del_timer(&hif_drv->scan_timer);
@@ -1885,9 +1885,9 @@ static void Handle_Disconnect(struct wilc_vif *vif)
        if (result) {
                netdev_err(vif->ndev, "Failed to send dissconect\n");
        } else {
-               tstrDisconnectNotifInfo strDisconnectNotifInfo;
+               struct disconnect_info strDisconnectNotifInfo;
 
-               memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo));
+               memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info));
 
                strDisconnectNotifInfo.u16reason = 0;
                strDisconnectNotifInfo.ie = NULL;

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

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index cc615db2908908cb4a1eb712f828d83e96d35325..83963a19bbe33b2c6e944d932d8b02d781b4cc1e 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -481,7 +481,7 @@ int wilc_connecting;
 static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                             struct connect_info *pstrConnectInfo,
                             u8 u8MacStatus,
-                            tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
+                            struct disconnect_info *pstrDisconnectNotifInfo,
                             void *pUserVoid)
 {
        struct wilc_priv *priv;