[PATCH 01/14] staging: wilc1000: remove typedef from tstrWILC_UsrScanReq

[PATCH 01/14] staging: wilc1000: remove typedef from tstrWILC_UsrScanReq

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the struct tstrWILC_UsrScanReq with
related comments and renames it to user_scan_req.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 2ca6a6e..0b3b4dc 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -225,7 +225,7 @@ struct hidden_network {
 	u8 u8ssidnum;
 };
 
-typedef struct {
+struct user_scan_req {
 	/* Scan user call back function */
 	wilc_scan_result pfUserScanResult;
 
@@ -234,7 +234,7 @@ typedef struct {
 
 	u32 u32RcvdChCount;
 	tstrFoundNetworkInfo astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
-} tstrWILC_UsrScanReq;
+};
 
 typedef struct {
 	u8 *pu8bssid;
@@ -304,8 +304,7 @@ enum p2p_listen_state {
 };
 
 struct host_if_drv {
-	/* Scan user structure */
-	tstrWILC_UsrScanReq strWILC_UsrScanReq;
+	struct user_scan_req strWILC_UsrScanReq;
 
 	/* Connect User structure */
 	tstrWILC_UsrConnReq strWILC_UsrConnReq;
-- 
1.9.1

[PATCH 02/14] staging: wilc1000: remove typedef from tstrWILC_UsrConnReq

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the struct tstrWILC_UsrConnReq with the
related comments and renames it to user_conn_req.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 0b3b4dc..73d9509 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -236,7 +236,7 @@ struct user_scan_req {
 	tstrFoundNetworkInfo astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
 };
 
-typedef struct {
+struct user_conn_req {
 	u8 *pu8bssid;
 	u8 *pu8ssid;
 	u8 u8security;
@@ -249,7 +249,7 @@ typedef struct {
 	bool IsHTCapable;
 	/* User specific parameter to be delivered through the Connect User Callback function */
 	void *u32UserConnectPvoid;
-} tstrWILC_UsrConnReq;
+};
 
 struct drv_handler {
 	u32 u32Address;
@@ -305,9 +305,7 @@ enum p2p_listen_state {
 
 struct host_if_drv {
 	struct user_scan_req strWILC_UsrScanReq;
-
-	/* Connect User structure */
-	tstrWILC_UsrConnReq strWILC_UsrConnReq;
+	struct user_conn_req strWILC_UsrConnReq;
 
 	/*Remain on channel struvture*/
 	struct remain_ch strHostIfRemainOnChan;
-- 
1.9.1

[PATCH 03/14] staging: wilc1000: remove typedef from tenuHostIFstate

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the enum tenuHostIFstate and
rename it to host_if_state.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 73d9509..5026500 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -72,8 +72,7 @@ typedef struct _tstrStatistics {
 
 } tstrStatistics;
 
-
-typedef enum {
+enum host_if_state {
 	HOST_IF_IDLE			= 0,
 	HOST_IF_SCANNING		= 1,
 	HOST_IF_CONNECTING		= 2,
@@ -81,7 +80,7 @@ typedef enum {
 	HOST_IF_CONNECTED		= 4,
 	HOST_IF_P2P_LISTEN		= 5,
 	HOST_IF_FORCE_32BIT		= 0xFFFFFFFF
-} tenuHostIFstate;
+};
 
 struct host_if_pmkid {
 	u8 bssid[ETH_ALEN];
@@ -313,7 +312,7 @@ struct host_if_drv {
 	u64 u64P2p_MgmtTimeout;
 	u8 u8P2PConnect;
 
-	tenuHostIFstate enuHostIFstate;
+	enum host_if_state enuHostIFstate;
 
 	u8 au8AssociatedBSSID[ETH_ALEN];
 	struct cfg_param_val strCfgValues;
-- 
1.9.1

[PATCH 04/14] staging: wilc1000: remove typedef from tstrFoundNetworkInfo

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the struct tstrFoundNetworkInfo and
rename it to found_net_info.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5026500..408bd48 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -155,10 +155,10 @@ typedef enum {
 	HT_ENABLE		= BIT(18),
 } tenuCfgParam;
 
-typedef struct {
+struct found_net_info {
 	u8 au8bssid[6];
 	s8 s8rssi;
-} tstrFoundNetworkInfo;
+};
 
 typedef enum {SCAN_EVENT_NETWORK_FOUND  = 0,
 	      SCAN_EVENT_DONE = 1,
@@ -232,7 +232,7 @@ struct user_scan_req {
 	void *u32UserScanPvoid;
 
 	u32 u32RcvdChCount;
-	tstrFoundNetworkInfo astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
+	struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
 };
 
 struct user_conn_req {
-- 
1.9.1

[PATCH 05/14] staging: wilc1000: remove typedef from tstrHiddenNetworkInfo

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the struct tstrHiddenNetworkInfo with
related comments and renames it to hidden_net_info.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 408bd48..401a7f6 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -212,15 +212,13 @@ struct rcvd_net_info {
 	u32 u32Length;
 };
 
-typedef struct _tstrHiddenNetworkInfo {
+struct hidden_net_info {
 	u8  *pu8ssid;
 	u8 u8ssidlen;
-
-} tstrHiddenNetworkInfo;
+};
 
 struct hidden_network {
-	/* MAX_SSID_LEN */
-	tstrHiddenNetworkInfo *pstrHiddenNetworkInfo;
+	struct hidden_net_info *pstrHiddenNetworkInfo;
 	u8 u8ssidnum;
 };
 
-- 
1.9.1

[PATCH 06/14] staging: wilc1000: remove unused struct WILC_WFIDrvHandle

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes unused the struct WILC_WFIDrvHandle with related
commnets.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 401a7f6..1b3dbc5 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -192,11 +192,6 @@ typedef void (*wilc_connect_result)(tenuConnDisconnEvent,
 typedef void (*wilc_remain_on_chan_expired)(void *, u32);  /*Remain on channel expiration callback function*/
 typedef void (*wilc_remain_on_chan_ready)(void *); /*Remain on channel callback function*/
 
-/* typedef u32 WILC_WFIDrvHandle; */
-typedef struct {
-	s32 s32Dummy;
-} *WILC_WFIDrvHandle;
-
 /*!
  *  @struct             rcvd_net_info
  *  @brief		Structure to hold Received Asynchronous Network info
-- 
1.9.1

[PATCH 07/14] staging: wilc1000: remove unused struct cfg_param_t

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes unused the struct cfg_param_t.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 1b3dbc5..b4cc164 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -57,12 +57,6 @@
 #define SCAN_EVENT_DONE_ABORTED
 #define NUM_CONCURRENT_IFC			2
 
-typedef struct {
-	u16 cfg_wid;
-	enum WID_TYPE cfg_type;
-	s8     *pu8Para;
-} cfg_param_t;
-
 typedef struct _tstrStatistics {
 	u8 u8LinkSpeed;
 	s8 s8RSSI;
-- 
1.9.1

[PATCH 08/14] staging: wilc1000: remove typedef from tstrStatistics

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the struct tstrStatistics and
rename it to statistics.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c         | 6 +++---
 drivers/staging/wilc1000/host_interface.h         | 7 +++----
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c370e8d..e6e79c7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2973,7 +2973,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
 
 }
 
-s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrStatistics)
+s32 Handle_GetStatistics(struct host_if_drv *drvHandler, struct statistics *pstrStatistics)
 {
 	struct wid strWIDList[5];
 	u32 u32WidsCount = 0, s32Error = 0;
@@ -3986,7 +3986,7 @@ static int hostIFthread(void *pvArg)
 			break;
 
 		case HOST_IF_MSG_GET_STATISTICS:
-			Handle_GetStatistics(msg.drv, (tstrStatistics *)msg.body.data);
+			Handle_GetStatistics(msg.drv, (struct statistics *)msg.body.data);
 			break;
 
 		case HOST_IF_MSG_GET_CHNL:
@@ -5533,7 +5533,7 @@ s32 host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd)
 	return s32Error;
 }
 
-s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics)
+s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, struct statistics *pstrStatistics)
 {
 	s32 s32Error = 0;
 	struct host_if_msg msg;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index b4cc164..d01bb8e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -57,14 +57,13 @@
 #define SCAN_EVENT_DONE_ABORTED
 #define NUM_CONCURRENT_IFC			2
 
-typedef struct _tstrStatistics {
+struct statistics {
 	u8 u8LinkSpeed;
 	s8 s8RSSI;
 	u32 u32TxCount;
 	u32 u32RxCount;
 	u32 u32TxFailureCount;
-
-} tstrStatistics;
+};
 
 enum host_if_state {
 	HOST_IF_IDLE			= 0,
@@ -1176,6 +1175,6 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
 
 void host_int_freeJoinParams(void *pJoinParams);
 
-s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics);
+s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, struct statistics *pstrStatistics);
 
 #endif
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 42219ea..d5b0214 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1576,7 +1576,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev,
 	}
 
 	if (nic->iftype == STATION_MODE) {
-		tstrStatistics strStatistics;
+		struct statistics strStatistics;
 
 		host_int_get_statistics(priv->hWILCWFIDrv, &strStatistics);
 
-- 
1.9.1

[PATCH 09/14] staging: wilc1000: remove typedef from tenuScanEvent

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the enum tenuScanEvent and
rename it to scan_event.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c         |  2 +-
 drivers/staging/wilc1000/host_interface.h         | 15 +++++++++------
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index e6e79c7..ebca521 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1370,7 +1370,7 @@ ERRORHANDLER:
  *  @date
  *  @version	1.0
  */
-static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent)
+static s32 Handle_ScanDone(struct host_if_drv *drvHandler, enum scan_event enuEvent)
 {
 	s32 s32Error = 0;
 
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index d01bb8e..8e20c30 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -153,10 +153,12 @@ struct found_net_info {
 	s8 s8rssi;
 };
 
-typedef enum {SCAN_EVENT_NETWORK_FOUND  = 0,
-	      SCAN_EVENT_DONE = 1,
-	      SCAN_EVENT_ABORTED = 2,
-	      SCAN_EVENT_FORCE_32BIT  = 0xFFFFFFFF} tenuScanEvent;
+enum scan_event {
+	SCAN_EVENT_NETWORK_FOUND	= 0,
+	SCAN_EVENT_DONE			= 1,
+	SCAN_EVENT_ABORTED		= 2,
+	SCAN_EVENT_FORCE_32BIT		= 0xFFFFFFFF
+};
 
 typedef enum {
 	CONN_DISCONN_EVENT_CONN_RESP		= 0,
@@ -173,7 +175,8 @@ enum KEY_TYPE {
 
 
 /*Scan callBack function definition*/
-typedef void (*wilc_scan_result)(tenuScanEvent, tstrNetworkInfo *, void *, void *);
+typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *,
+				  void *, void *);
 
 /*Connect callBack function definition*/
 typedef void (*wilc_connect_result)(tenuConnDisconnEvent,
@@ -1171,7 +1174,7 @@ s32 host_int_frame_register(struct host_if_drv *hWFIDrv, u16 u16FrameType, bool
 s32 host_int_set_wfi_drv_handler(struct host_if_drv *u32address);
 s32 host_int_set_operation_mode(struct host_if_drv *hWFIDrv, u32 u32mode);
 
-static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent);
+static s32 Handle_ScanDone(struct host_if_drv *drvHandler, enum scan_event enuEvent);
 
 void host_int_freeJoinParams(void *pJoinParams);
 
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d5b0214..d39ef0b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -357,7 +357,7 @@ void add_network_to_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, vo
  *  @date
  *  @version	1.0
  */
-static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
+static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
 {
 	struct wilc_priv *priv;
 	struct wiphy *wiphy;
-- 
1.9.1

[PATCH 10/14] staging: wilc1000: rename typedef from tenuCfgParam

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch rename typedef from the enum tenuCfgParamand
rename it to cfg_param.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8e20c30..20d8a9e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -126,7 +126,7 @@ struct cfg_param_val {
 
 };
 
-typedef enum {
+enum cfg_param {
 	RETRY_SHORT		= BIT(0),
 	RETRY_LONG		= BIT(1),
 	FRAG_THRESHOLD		= BIT(2),
@@ -146,7 +146,7 @@ typedef enum {
 	PASSIVE_SCANTIME	= BIT(16),
 	CURRENT_TX_RATE		= BIT(17),
 	HT_ENABLE		= BIT(18),
-} tenuCfgParam;
+};
 
 struct found_net_info {
 	u8 au8bssid[6];
-- 
1.9.1

[PATCH 11/14] staging: wilc1000: remove typedef from tenuConnDisconnEvent

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the enum tenuConnDisconnEvent and
renames it to conn_event.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h         | 6 +++---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 20d8a9e..74ddbdd 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -160,11 +160,11 @@ enum scan_event {
 	SCAN_EVENT_FORCE_32BIT		= 0xFFFFFFFF
 };
 
-typedef enum {
+enum conn_event {
 	CONN_DISCONN_EVENT_CONN_RESP		= 0,
 	CONN_DISCONN_EVENT_DISCONN_NOTIF	= 1,
 	CONN_DISCONN_EVENT_FORCE_32BIT		= 0xFFFFFFFF
-} tenuConnDisconnEvent;
+};
 
 enum KEY_TYPE {
 	WEP,
@@ -179,7 +179,7 @@ typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *,
 				  void *, void *);
 
 /*Connect callBack function definition*/
-typedef void (*wilc_connect_result)(tenuConnDisconnEvent,
+typedef void (*wilc_connect_result)(enum conn_event,
 				     tstrConnectInfo *,
 				     u8,
 				     tstrDisconnectNotifInfo *,
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d39ef0b..d70381d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -531,7 +531,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID);
  */
 int connecting;
 
-static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
+static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
 			     tstrConnectInfo *pstrConnectInfo,
 			     u8 u8MacStatus,
 			     tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
-- 
1.9.1

[PATCH 12/14] staging: wilc1000: remove typedef from tenuScanConnTimer

[Tony Cho]

From: Leo Kim <leo.kim@atmel.com>

This patch removes typedef from the enum tenuScanConnTimer and
renames it to scan_conn_timer.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index ebca521..b8b39b2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -435,11 +435,11 @@ struct join_bss_param {
 	u8 au8StartTime[4];
 };
 
-typedef enum {
+enum scan_conn_timer {
 	SCAN_TIMER = 0,
 	CONNECT_TIMER	= 1,
 	SCAN_CONNECT_TIMER_FORCE_32BIT = 0xFFFFFFFF
-} tenuScanConnTimer;
+};
 
 /*****************************************************************************/
 /*																			 */
@@ -4876,7 +4876,7 @@ s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
 	s32 s32Error = 0;
 	struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
 	struct host_if_msg msg;
-	tenuScanConnTimer enuScanConnTimer;
+	enum scan_conn_timer enuScanConnTimer;
 
 	if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
 		s32Error = -EFAULT;
@@ -5583,7 +5583,7 @@ s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,
 	s32 s32Error = 0;
 	struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
 	struct host_if_msg msg;
-	tenuScanConnTimer enuScanConnTimer;
+	enum scan_conn_timer enuScanConnTimer;
 
 	if (pstrWFIDrv == NULL || ScanResult == NULL) {
 		PRINT_ER("pstrWFIDrv or ScanResult = NULL\n");
-- 
1.9.1

[PATCH 13/14] staging: wilc1000: host_infterface.h: remove unused enum tenuWILC_StaFlag

[Tony Cho]

This patch removes unused enum tenuWILC_StaFlag from the
host_interface.h.

Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/host_interface.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 74ddbdd..f9b5362 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -322,26 +322,6 @@ struct host_if_drv {
 	bool IFC_UP;
 };
 
-/*!
- *  @enum               tenuWILC_StaFlag
- *  @brief			Used to decode the station flag set and mask in tstrWILC_AddStaParam
- *  @details
- *  @todo
- *  @sa			tstrWILC_AddStaParam, enum nl80211_sta_flags
- *  @author		Enumeraion's creator
- *  @date			12 July 2012
- *  @version		1.0 Description
- */
-
-typedef enum {
-	WILC_STA_FLAG_INVALID = 0,
-	WILC_STA_FLAG_AUTHORIZED,                       /*!<  station is authorized (802.1X)*/
-	WILC_STA_FLAG_SHORT_PREAMBLE,   /*!< station is capable of receiving frames	with short barker preamble*/
-	WILC_STA_FLAG_WME,                              /*!< station is WME/QoS capable*/
-	WILC_STA_FLAG_MFP,                                      /*!< station uses management frame protection*/
-	WILC_STA_FLAG_AUTHENTICATED             /*!< station is authenticated*/
-} tenuWILC_StaFlag;
-
 struct add_sta_param {
 	u8 au8BSSID[ETH_ALEN];
 	u16 u16AssocID;
-- 
1.9.1

[PATCH 14/14] staging: wilc1000: remove wilc_wlan.c included in wilc_wfi_cfgoperations.c

[Tony Cho]

This patch removes "wilc_wlan.c" from the wilc_wfi_cfgoperation.c file and
adds wilc_wlan.o into Makefile to compile it because there is few benefits.
This patch also adds "wilc_wfi_netdevice.h" in the wilc_wlan.c file to avoid
the compile errors.

Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/Makefile                 | 3 ++-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1 -
 drivers/staging/wilc1000/wilc_wlan.c              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index f495061..64c2f1b 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -21,7 +21,8 @@ ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC
 wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
 			wilc_msgqueue.o \
 			coreconfigurator.o host_interface.o \
-			wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o
+			wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o \
+			wilc_wlan.o
 
 wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o
 wilc1000-$(CONFIG_WILC1000_SPI) += linux_wlan_spi.o
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d70381d..2ad08a7 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -11,7 +11,6 @@
  */
 
 #include "wilc_wfi_cfgoperations.h"
-#include "wilc_wlan.c"
 #ifdef WILC_SDIO
 #include "linux_wlan_sdio.h"
 #endif
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index e11d3d3..1d23bad 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -8,7 +8,7 @@
 /* //////////////////////////////////////////////////////////////////////////// */
 
 #include "wilc_wlan_if.h"
-#include "wilc_wlan.h"
+#include "wilc_wfi_netdevice.h"
 #include "wilc_wlan_cfg.h"
 
 /********************************************
-- 
1.9.1

Re: [PATCH 01/14] staging: wilc1000: remove typedef from tstrWILC_UsrScanReq

[Greg KH]

On Thu, Oct 08, 2015 at 10:49:08AM +0900, Tony Cho wrote:
> From: Leo Kim <leo.kim@atmel.com>
> 
> This patch removes typedef from the struct tstrWILC_UsrScanReq with
> related comments and renames it to user_scan_req.
> 
> Signed-off-by: Leo Kim <leo.kim@atmel.com>
> Signed-off-by: Tony Cho <tony.cho@atmel.com>
> ---
>  drivers/staging/wilc1000/host_interface.h | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

This series also didn't apply :(

Re: [PATCH 08/14] staging: wilc1000: remove typedef from tstrStatistics

[Dan Carpenter]

I feel like the name 'statistics' is very vague.  I guess it's so vague
that it's unlikely anyone else will try use it...

regards,
dan carpenter

Re: [PATCH 08/14] staging: wilc1000: remove typedef from tstrStatistics

[Dan Carpenter]

On Fri, Oct 09, 2015 at 11:16:28AM +0300, Dan Carpenter wrote:
> I feel like the name 'statistics' is very vague.  I guess it's so vague
> that it's unlikely anyone else will try use it...
> 

A lot of these are pretty vague.  But I guess it's probably ok...
Nevermind me.

regards,
dan carpenter

Re: [PATCH 08/14] staging: wilc1000: remove typedef from tstrStatistics

[Tony Cho]

Hi Dan,

I will find much clearer naming rules when sending version 2 for them.

Thanks for your opinion,

Tony.


On 2015년 10월 09일 17:16, Dan Carpenter wrote:
> I feel like the name 'statistics' is very vague.  I guess it's so vague
> that it's unlikely anyone else will try use it...
>
> regards,
> dan carpenter