diff options
| author | Leo Kim <leo.kim@atmel.com> | 2015-10-12 07:55:59 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-13 03:58:01 (GMT) |
| commit | 1ec3815f38d74c6ef99dc48d9a7cc18555108565 (patch) | |
| tree | 236bd412191e2de243738221f7cb85df7884cf21 | |
| parent | 03e7b9c4283b325362e9c6b2640e21d2a3e131a7 (diff) | |
| download | linux-1ec3815f38d74c6ef99dc48d9a7cc18555108565.tar.xz | |
staging: wilc1000: remove typedef from tenuScanEvent
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.h | 15 | ||||
| -rw-r--r-- | 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 6f4eda6..54b2a61 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1371,7 +1371,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 1097f10..64ee054 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 int host_int_set_wfi_drv_handler(struct host_if_drv *address); int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode); -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 dd96909..45a10c5 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; |