Skip to content

Commit 1ec3815

Browse files
Leo-Kimgregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Tony Cho <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 03e7b9c commit 1ec3815

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

drivers/staging/wilc1000/host_interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
13711371
* @date
13721372
* @version 1.0
13731373
*/
1374-
static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent)
1374+
static s32 Handle_ScanDone(struct host_if_drv *drvHandler, enum scan_event enuEvent)
13751375
{
13761376
s32 s32Error = 0;
13771377

drivers/staging/wilc1000/host_interface.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,12 @@ struct found_net_info {
153153
s8 s8rssi;
154154
};
155155

156-
typedef enum {SCAN_EVENT_NETWORK_FOUND = 0,
157-
SCAN_EVENT_DONE = 1,
158-
SCAN_EVENT_ABORTED = 2,
159-
SCAN_EVENT_FORCE_32BIT = 0xFFFFFFFF} tenuScanEvent;
156+
enum scan_event {
157+
SCAN_EVENT_NETWORK_FOUND = 0,
158+
SCAN_EVENT_DONE = 1,
159+
SCAN_EVENT_ABORTED = 2,
160+
SCAN_EVENT_FORCE_32BIT = 0xFFFFFFFF
161+
};
160162

161163
typedef enum {
162164
CONN_DISCONN_EVENT_CONN_RESP = 0,
@@ -173,7 +175,8 @@ enum KEY_TYPE {
173175

174176

175177
/*Scan callBack function definition*/
176-
typedef void (*wilc_scan_result)(tenuScanEvent, tstrNetworkInfo *, void *, void *);
178+
typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *,
179+
void *, void *);
177180

178181
/*Connect callBack function definition*/
179182
typedef void (*wilc_connect_result)(tenuConnDisconnEvent,
@@ -1171,7 +1174,7 @@ s32 host_int_frame_register(struct host_if_drv *hWFIDrv, u16 u16FrameType, bool
11711174
int host_int_set_wfi_drv_handler(struct host_if_drv *address);
11721175
int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode);
11731176

1174-
static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent);
1177+
static s32 Handle_ScanDone(struct host_if_drv *drvHandler, enum scan_event enuEvent);
11751178

11761179
void host_int_freeJoinParams(void *pJoinParams);
11771180

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void add_network_to_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, vo
357357
* @date
358358
* @version 1.0
359359
*/
360-
static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
360+
static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
361361
{
362362
struct wilc_priv *priv;
363363
struct wiphy *wiphy;

0 commit comments

Comments
 (0)