Commit da711eb6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: wilc1000: remove WILC_TimerHandle typedef 



Use the proper structure (struct timer_list) instead, which makes things
much more readable.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80e29c7a

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extern s32 TransportDeInit(void); 
extern u8 connecting;



#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP

extern WILC_TimerHandle hDuringIpTimer;

extern struct timer_list hDuringIpTimer;

#endif



/*BugID_5137*/
@@ -546,7 +546,7 @@ static struct semaphore hSemHostIFthrdEnd; 
struct semaphore hSemDeinitDrvHandle;

static struct semaphore hWaitResponse;

struct semaphore hSemHostIntDeinit;

WILC_TimerHandle g_hPeriodicRSSI;

struct timer_list g_hPeriodicRSSI;

drivers/staging/wilc1000/host_interface.h

+3 −3
Original line number Diff line number Diff line
@@ -367,10 +367,10 @@ typedef struct { 
	struct semaphore hSemGetCHNL;

	struct semaphore hSemInactiveTime;

/* timer handlers */

	WILC_TimerHandle hScanTimer;

	WILC_TimerHandle hConnectTimer;

	struct timer_list hScanTimer;

	struct timer_list hConnectTimer;

	#ifdef WILC_P2P

	WILC_TimerHandle hRemainOnChannel;

	struct timer_list hRemainOnChannel;

	#endif



	bool IFC_UP;

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ extern void resolve_disconnect_aberration(void *drvHandler); 
extern u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];

void wilc1000_wlan_deinit(linux_wlan_t *nic);

#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP

extern WILC_TimerHandle hDuringIpTimer;

extern struct timer_list hDuringIpTimer;

#endif



static int linux_wlan_device_power(int on_off)

drivers/staging/wilc1000/wilc_platform.h

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
 *      OS specific types

 *******************************************************************/



typedef struct timer_list WILC_TimerHandle;







/* Message Queue type is a structure */

typedef struct __Message_struct {

	void *pvBuffer;

drivers/staging/wilc1000/wilc_timer.c

+4 −4
Original line number Diff line number Diff line 


#include "wilc_timer.h"



WILC_ErrNo WILC_TimerCreate(WILC_TimerHandle *pHandle,

WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,

	tpfWILC_TimerFunction pfCallback, tstrWILC_TimerAttrs *pstrAttrs)

{

	WILC_ErrNo s32RetStatus = WILC_SUCCESS;
@@ -10,7 +10,7 @@ WILC_ErrNo WILC_TimerCreate(WILC_TimerHandle *pHandle, 
	return s32RetStatus;

}



WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,

WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,

	tstrWILC_TimerAttrs *pstrAttrs)

{

	WILC_ErrNo s32RetStatus = WILC_FAIL;
@@ -23,7 +23,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle, 
}





WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout,

WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout,

	void *pvArg, tstrWILC_TimerAttrs *pstrAttrs)

{

	WILC_ErrNo s32RetStatus = WILC_FAIL;
@@ -34,7 +34,7 @@ WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout, 
	return s32RetStatus;

}



WILC_ErrNo WILC_TimerStop(WILC_TimerHandle *pHandle,

WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle,

	tstrWILC_TimerAttrs *pstrAttrs)

{

	WILC_ErrNo s32RetStatus = WILC_FAIL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE