diff options
| author | Greg Kroah-Hartman | 2015-08-15 05:11:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-15 05:35:53 +0200 |
| commit | 4183e9794c751c5139e4599a0c512c7804575a82 (patch) | |
| tree | 54a0a2e8a334bd90783f9d7083efdb9358d3844e /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |
| parent | staging: wilc1000: remove WILC_TimerStop() (diff) | |
| download | kernel-qcow2-linux-4183e9794c751c5139e4599a0c512c7804575a82.tar.gz kernel-qcow2-linux-4183e9794c751c5139e4599a0c512c7804575a82.tar.xz kernel-qcow2-linux-4183e9794c751c5139e4599a0c512c7804575a82.zip | |
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/wilc_wfi_cfgoperations.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 0e79bd3f964f..b29ea90da56f 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -145,7 +145,7 @@ void clear_shadow_scan(void *pUserVoid) { int i; if (op_ifcs == 0) { - WILC_TimerDestroy(&hAgingTimer); + del_timer_sync(&hAgingTimer); PRINT_INFO(CORECONFIG_DBG, "destroy aging timer\n"); for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) { @@ -3876,7 +3876,7 @@ int WILC_WFI_DeInitHostInt(struct net_device *net) #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP if (op_ifcs == 0) { PRINT_D(CORECONFIG_DBG, "destroy during ip\n"); - WILC_TimerDestroy(&hDuringIpTimer); + del_timer_sync(&hDuringIpTimer); } #endif |