Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec3815f authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove typedef from tenuScanEvent 



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

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03e7b9c4

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, 
 *  @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;

drivers/staging/wilc1000/host_interface.h

+9 −6
Original line number Diff line number Diff line
@@ -153,10 +153,12 @@ struct found_net_info { 
	s8 s8rssi;

};



typedef enum {SCAN_EVENT_NETWORK_FOUND  = 0,

enum scan_event {

	SCAN_EVENT_NETWORK_FOUND	= 0,

	SCAN_EVENT_DONE			= 1,

	SCAN_EVENT_ABORTED		= 2,

	      SCAN_EVENT_FORCE_32BIT  = 0xFFFFFFFF} tenuScanEvent;

	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);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -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;