staging: wilc1000: rename u16reason in disconnect_info

This patch renames u16reason to reason to remove u16 prefix. There is no
need to use prefix to show data type.

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 6256d71..63eca24 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -115,7 +115,7 @@ struct connect_info {
 };
 
 struct disconnect_info {
-       u16 u16reason;
+       u16 reason;
        u8 *ie;
        size_t ie_len;
 };

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4cdd340..a6b7a22 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1552,7 +1552,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                                Handle_ScanDone(vif, SCAN_EVENT_ABORTED);
                        }
 
-                       strDisconnectNotifInfo.u16reason = 0;
+                       strDisconnectNotifInfo.reason = 0;
                        strDisconnectNotifInfo.ie = NULL;
                        strDisconnectNotifInfo.ie_len = 0;
 
@@ -1889,7 +1889,7 @@ static void Handle_Disconnect(struct wilc_vif *vif)
 
                memset(&strDisconnectNotifInfo, 0, sizeof(struct disconnect_info));
 
-               strDisconnectNotifInfo.u16reason = 0;
+               strDisconnectNotifInfo.reason = 0;
                strDisconnectNotifInfo.ie = NULL;
                strDisconnectNotifInfo.ie_len = 0;
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 83963a1..378c350 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -559,11 +559,11 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                if (!pstrWFIDrv->p2p_connect)
                        wlan_channel = INVALID_CHANNEL;
                if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) {
-                       pstrDisconnectNotifInfo->u16reason = 3;
+                       pstrDisconnectNotifInfo->reason = 3;
                } else if ((!pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) {
-                       pstrDisconnectNotifInfo->u16reason = 1;
+                       pstrDisconnectNotifInfo->reason = 1;
                }
-               cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie,
+               cfg80211_disconnected(dev, pstrDisconnectNotifInfo->reason, pstrDisconnectNotifInfo->ie,
                                      pstrDisconnectNotifInfo->ie_len, false,
                                      GFP_KERNEL);
        }