diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 20:11:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 20:35:53 -0700 |
| commit | 4183e9794c751c5139e4599a0c512c7804575a82 (patch) | |
| tree | 54a0a2e8a334bd90783f9d7083efdb9358d3844e /drivers/staging/wilc1000/host_interface.c | |
| parent | 8972d0fe41e1869b0c7f4c164ea7bffc073dd6b8 (diff) | |
| download | op-kernel-dev-4183e9794c751c5139e4599a0c512c7804575a82.zip op-kernel-dev-4183e9794c751c5139e4599a0c512c7804575a82.tar.gz | |
staging: wilc1000: remove WILC_TimerDestroy()
It was just a wrapper around del_timer_sync() so call that instead.
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>
Diffstat (limited to 'drivers/staging/wilc1000/host_interface.c')
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index ca80690..887aec2 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -6618,13 +6618,13 @@ _fail_mem_: kfree(pstrWFIDrv); #ifdef WILC_P2P _fail_timer_3: - WILC_TimerDestroy(&pstrWFIDrv->hRemainOnChannel); + del_timer_sync(&pstrWFIDrv->hRemainOnChannel); #endif _fail_timer_2: up(&(pstrWFIDrv->gtOsCfgValuesSem)); - WILC_TimerDestroy(&pstrWFIDrv->hConnectTimer); + del_timer_sync(&pstrWFIDrv->hConnectTimer); _fail_timer_1: - WILC_TimerDestroy(&pstrWFIDrv->hScanTimer); + del_timer_sync(&pstrWFIDrv->hScanTimer); _fail_thread_: kthread_stop(HostIFthreadHandler); _fail_mq_: @@ -6673,25 +6673,25 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv) /*BugID_5348*/ /*Destroy all timers before acquiring hSemDeinitDrvHandle*/ /*to guarantee handling all messages befor proceeding*/ - if (WILC_TimerDestroy(&pstrWFIDrv->hScanTimer)) { + if (del_timer_sync(&pstrWFIDrv->hScanTimer)) { PRINT_D(HOSTINF_DBG, ">> Scan timer is active\n"); /* msleep(HOST_IF_SCAN_TIMEOUT+1000); */ } - if (WILC_TimerDestroy(&pstrWFIDrv->hConnectTimer)) { + if (del_timer_sync(&pstrWFIDrv->hConnectTimer)) { PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */ } - if (WILC_TimerDestroy(&g_hPeriodicRSSI)) { + if (del_timer_sync(&g_hPeriodicRSSI)) { PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */ } #ifdef WILC_P2P /*Destroy Remain-onchannel Timer*/ - WILC_TimerDestroy(&pstrWFIDrv->hRemainOnChannel); + del_timer_sync(&pstrWFIDrv->hRemainOnChannel); #endif host_int_set_wfi_drv_handler(NULL); @@ -6715,7 +6715,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv) memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg)); if (clients_count == 1) { - if (WILC_TimerDestroy(&g_hPeriodicRSSI)) { + if (del_timer_sync(&g_hPeriodicRSSI)) { PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */ } |
