aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-12-21 17:56:59 -0800
committerTejun Heo <tj@kernel.org>2012-12-28 13:40:15 -0800
commit02957f92bcc96be5c84a4000f9d22c592158602e (patch)
treee0b0f96839d8c29651cda282d421c3b2f016f392
parent6d394e192541a106bf78f361e2c4e586a8344e3e (diff)
downloadvexpress-lsk-02957f92bcc96be5c84a4000f9d22c592158602e.tar.gz
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
-rw-r--r--drivers/net/wireless/ti/wl1251/ps.c3
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 db719f7d269..b9e27b98bbc 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)
unsigned long timeout, start;
u32 elp_reg;
- if (delayed_work_pending(&wl->elp_work))
- cancel_delayed_work(&wl->elp_work);
+ cancel_delayed_work(&wl->elp_work);
if (!wl->elp)
return 0;