diff options
author | Tejun Heo <tj@kernel.org> | 2012-12-21 20:56:59 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-12-28 16:40:15 -0500 |
commit | 02957f92bcc96be5c84a4000f9d22c592158602e (patch) | |
tree | e0b0f96839d8c29651cda282d421c3b2f016f392 /drivers/net/wireless/ti/wl1251 | |
parent | 6d394e192541a106bf78f361e2c4e586a8344e3e (diff) |
wl1251: don't use [delayed_]work_pending()
There's no need to test whether a (delayed) work item in pending
before queueing, flushing or cancelling it. Most uses are unnecessary
and quite a few of them are buggy.
Remove unnecessary pending tests from wl1251. Only compile tested.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Luciano Coelho <coelho@ti.com>
Cc: linux-wireless@vger.kernel.org
Diffstat (limited to 'drivers/net/wireless/ti/wl1251')
-rw-r--r-- | drivers/net/wireless/ti/wl1251/ps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wl1251/ps.c b/drivers/net/wireless/ti/wl1251/ps.c index db719f7d2692..b9e27b98bbc9 100644 --- a/drivers/net/wireless/ti/wl1251/ps.c +++ b/drivers/net/wireless/ti/wl1251/ps.c | |||
@@ -68,8 +68,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl) | |||
68 | unsigned long timeout, start; | 68 | unsigned long timeout, start; |
69 | u32 elp_reg; | 69 | u32 elp_reg; |
70 | 70 | ||
71 | if (delayed_work_pending(&wl->elp_work)) | 71 | cancel_delayed_work(&wl->elp_work); |
72 | cancel_delayed_work(&wl->elp_work); | ||
73 | 72 | ||
74 | if (!wl->elp) | 73 | if (!wl->elp) |
75 | return 0; | 74 | return 0; |