diff options
| author | Vaishali Thakkar <vthakkar1994@gmail.com> | 2015-03-06 16:23:35 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-16 15:46:07 +0100 |
| commit | 6501c8e7d86cca5fab74f873810cbc573273d1b4 (patch) | |
| tree | ef117cb7292bdd08336dcccdef47c5715ccad46b /drivers/staging/rtl8712/rtl871x_sta_mgt.c | |
| parent | 2f1758d606e96e19caf9ced2b617b5d555d86f6e (diff) | |
| download | op-kernel-dev-6501c8e7d86cca5fab74f873810cbc573273d1b4.zip op-kernel-dev-6501c8e7d86cca5fab74f873810cbc573273d1b4.tar.gz | |
Staging: rtl8712: Eliminate use of _cancel_timer_ex
Use timer API function del_timer_sync instead of driver
specific function _cancel_timer_ex as besides deactivating
a timer, it ensures that the timer is stopped on all
CPUs before the driver exists. Also, definition of function
_cancel_timer_ex is removed as it is no longer needed after
this change.
This is done using Coccinelle and semantic patch used for
this is as follows:
@@ expression x; @@
- _cancel_timer_ex (&x);
+ del_timer_sync (&x);
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_sta_mgt.c')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_sta_mgt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c index 1752121..7bb96c4 100644 --- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c +++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c @@ -198,7 +198,7 @@ void r8712_free_stainfo(struct _adapter *padapter, struct sta_info *psta) * cancel reordering_ctrl_timer */ for (i = 0; i < 16; i++) { preorder_ctrl = &psta->recvreorder_ctrl[i]; - _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); + del_timer_sync(&preorder_ctrl->reordering_ctrl_timer); } spin_lock(&(pfree_sta_queue->lock)); /* insert into free_sta_queue; 20061114 */ |
