staging: wilc1000: remove typedef from tenuConnDisconnEvent

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ad4c1c4a448358f0c58805065aff15d4f857107f..a88fd822921c981332c5c25afd0fce11e929d1f9 100644 (file)
--- 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 45a10c58be5252943d3ae534e9db2e87d3243c72..11f9d465ece6b5a016f09bb165f52ec13831e98b 100644 (file)
--- 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,