From 8972d0fe41e1869b0c7f4c164ea7bffc073dd6b8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Aug 2015 20:04:13 -0700 Subject: [PATCH] staging: wilc1000: remove WILC_TimerStop() It was just a wrapper around del_timer() so call that instead. Cc: Johnny Kim Cc: Rachel Kim Cc: Dean Lee Cc: Chris Park Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 20 ++++++++--------- drivers/staging/wilc1000/linux_wlan.c | 2 +- drivers/staging/wilc1000/wilc_timer.c | 9 -------- drivers/staging/wilc1000/wilc_timer.h | 22 ------------------- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- 5 files changed, 12 insertions(+), 43 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 1184327228ad..ca806902ebb7 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1366,7 +1366,7 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr *pstrHost WILC_CATCH(s32Error) { - WILC_TimerStop(&pstrWFIDrv->hScanTimer); + del_timer(&pstrWFIDrv->hScanTimer); /*if there is an ongoing scan request*/ Handle_ScanDone(drvHandler, SCAN_EVENT_ABORTED); } @@ -1966,7 +1966,7 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps { tstrConnectInfo strConnectInfo; - WILC_TimerStop(&pstrWFIDrv->hConnectTimer); + del_timer(&pstrWFIDrv->hConnectTimer); PRINT_D(HOSTINF_DBG, "could not start connecting to the required network\n"); @@ -2477,7 +2477,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy } - WILC_TimerStop(&pstrWFIDrv->hConnectTimer); + del_timer(&pstrWFIDrv->hConnectTimer); pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP, &strConnectInfo, u8MacStatus, @@ -2556,7 +2556,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) { PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running OBSS Scan >>\n\n"); - WILC_TimerStop(&pstrWFIDrv->hScanTimer); + del_timer(&pstrWFIDrv->hScanTimer); Handle_ScanDone((void *)pstrWFIDrv, SCAN_EVENT_ABORTED); } @@ -2633,7 +2633,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy PRINT_D(HOSTINF_DBG, "Received MAC_DISCONNECTED from the FW while scanning\n"); PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running Scan >>\n\n"); /*Abort the running scan*/ - WILC_TimerStop(&pstrWFIDrv->hScanTimer); + del_timer(&pstrWFIDrv->hScanTimer); if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) Handle_ScanDone(pstrWFIDrv, SCAN_EVENT_ABORTED); @@ -3067,7 +3067,7 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) strDisconnectNotifInfo.ie_len = 0; if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) { - WILC_TimerStop(&pstrWFIDrv->hScanTimer); + del_timer(&pstrWFIDrv->hScanTimer); pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, NULL, pstrWFIDrv->strWILC_UsrScanReq.u32UserScanPvoid, NULL); @@ -3080,7 +3080,7 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) /*Stop connect timer, if connection in progress*/ if (pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) { PRINT_D(HOSTINF_DBG, "Upper layer requested termination of connection\n"); - WILC_TimerStop(&pstrWFIDrv->hConnectTimer); + del_timer(&pstrWFIDrv->hConnectTimer); } pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF, NULL, @@ -3984,7 +3984,7 @@ static void ListenTimerCB(void *pvArg) tstrHostIFmsg strHostIFmsg; tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)pvArg; /*Stopping remain-on-channel timer*/ - WILC_TimerStop(&pstrWFIDrv->hRemainOnChannel); + del_timer(&pstrWFIDrv->hRemainOnChannel); /* prepare the Timer Callback message */ memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg)); @@ -4395,7 +4395,7 @@ static int hostIFthread(void *pvArg) break; case HOST_IF_MSG_RCVD_SCAN_COMPLETE: - WILC_TimerStop(&pstrWFIDrv->hScanTimer); + del_timer(&pstrWFIDrv->hScanTimer); PRINT_D(HOSTINF_DBG, "scan completed successfully\n"); /*BugID_5213*/ @@ -6991,7 +6991,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID) WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT); /*Stopping remain-on-channel timer*/ - WILC_TimerStop(&pstrWFIDrv->hRemainOnChannel); + del_timer(&pstrWFIDrv->hRemainOnChannel); /* prepare the timer fire Message */ memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg)); diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 22053e57aa15..7eacc2f326df 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -286,7 +286,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) { pstrWFIDrv->IFC_UP = 1; g_obtainingIP = false; - WILC_TimerStop(&hDuringIpTimer); + del_timer(&hDuringIpTimer); PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n"); } diff --git a/drivers/staging/wilc1000/wilc_timer.c b/drivers/staging/wilc1000/wilc_timer.c index 5b2a527f1d94..3617093f58f2 100644 --- a/drivers/staging/wilc1000/wilc_timer.c +++ b/drivers/staging/wilc1000/wilc_timer.c @@ -32,12 +32,3 @@ WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, } return s32RetStatus; } - -WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle) -{ - WILC_ErrNo s32RetStatus = WILC_FAIL; - if (pHandle != NULL) - s32RetStatus = del_timer(pHandle); - - return s32RetStatus; -} diff --git a/drivers/staging/wilc1000/wilc_timer.h b/drivers/staging/wilc1000/wilc_timer.h index 529f299880a7..870a6950f6cd 100644 --- a/drivers/staging/wilc1000/wilc_timer.h +++ b/drivers/staging/wilc1000/wilc_timer.h @@ -84,26 +84,4 @@ WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle); */ WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, void *pvArg); - -/*! - * @brief Stops a given timer - * @details This function will move the timer to the IDLE state cancelling - * any sheduled callback execution. - * if this function is called on a timer already in the IDLE state - * it will have no effect. - * if this function is called on a timer in EXECUTING state - * (callback has already started) it will wait until executing is - * done then move the timer to the IDLE state (which is trivial - * work if the timer is non periodic) - * @param[in] pHandle handle to the timer object - * @return Error code indicating sucess/failure - * @sa WILC_TimerAttrs - * @author syounan - * @date 16 Aug 2010 - * @version 1.0 - */ -WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle); - - - #endif diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index a505677d47d8..0e79bd3f964f 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2843,7 +2843,7 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP g_obtainingIP = false; - WILC_TimerStop(&hDuringIpTimer); + del_timer(&hDuringIpTimer); PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n"); #endif /*BugID_5137*/ -- 2.20.1