diff options
| author | 2015-10-12 16:56:01 +0900 | |
|---|---|---|
| committer | 2015-10-12 20:58:01 -0700 | |
| commit | ed3f0379a272d7ef4e787f42575eac642b5b020e (patch) | |
| tree | 7df9c88044e8fa6dfebafcd5e98c1c0c4b9ec9d8 | |
| parent | staging: wilc1000: rename typedef from tenuCfgParam (diff) | |
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>
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.h | 6 | ||||
| -rw-r--r-- | 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 ad4c1c4a4483..a88fd822921c 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 45a10c58be52..11f9d465ece6 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, |
