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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
Родитель
80e29c7a80
Коммит
da711eb68e
|
|
@ -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;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
#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;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ typedef struct {
|
|||
* @date 16 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_TimerCreate(WILC_TimerHandle *pHandle,
|
||||
WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,
|
||||
tpfWILC_TimerFunction pfCallback, tstrWILC_TimerAttrs *pstrAttrs);
|
||||
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ WILC_ErrNo WILC_TimerCreate(WILC_TimerHandle *pHandle,
|
|||
* @date 16 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
|
||||
WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,
|
||||
tstrWILC_TimerAttrs *pstrAttrs);
|
||||
|
||||
/*!
|
||||
|
|
@ -99,7 +99,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
|
|||
* @date 16 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout, void *pvArg,
|
||||
WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, void *pvArg,
|
||||
tstrWILC_TimerAttrs *pstrAttrs);
|
||||
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout, void *pvAr
|
|||
* @date 16 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_TimerStop(WILC_TimerHandle *pHandle,
|
||||
WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle,
|
||||
tstrWILC_TimerAttrs *pstrAttrs);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ extern int mac_close(struct net_device *ndev);
|
|||
tstrNetworkInfo astrLastScannedNtwrksShadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
|
||||
u32 u32LastScannedNtwrksCountShadow;
|
||||
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
|
||||
WILC_TimerHandle hDuringIpTimer;
|
||||
struct timer_list hDuringIpTimer;
|
||||
#endif
|
||||
WILC_TimerHandle hAgingTimer;
|
||||
struct timer_list hAgingTimer;
|
||||
static u8 op_ifcs;
|
||||
extern u8 u8ConnectedSSID[6];
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче