| Message ID | 1356141435-17340-10-git-send-email-tj@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, 2012-12-21 at 17:56 -0800, Tejun Heo wrote: > 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> > Cc: Luciano Coelho <coelho@ti.com> > Cc: linux-wireless@vger.kernel.org > --- > Please let me know how this patch should be routed. I can take it > through the workqueue tree if necessary. > > Thanks. It's probably easier if you take it via your tree. This driver doesn't get patches very often, so I doubt there will be any conflicts. Thank you! Acked-by: Luciano Coelho <coelho@ti.com> -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Dec 22, 2012 at 04:14:29PM +0200, Luciano Coelho wrote: > On Fri, 2012-12-21 at 17:56 -0800, Tejun Heo wrote: > > 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> > > Cc: Luciano Coelho <coelho@ti.com> > > Cc: linux-wireless@vger.kernel.org > > --- > > Please let me know how this patch should be routed. I can take it > > through the workqueue tree if necessary. > > > > Thanks. > > It's probably easier if you take it via your tree. This driver doesn't > get patches very often, so I doubt there will be any conflicts. > > Thank you! > > Acked-by: Luciano Coelho <coelho@ti.com> Applied to wq/for-3.9-cleanups. Thanks.
diff --git a/drivers/net/wireless/ti/wl1251/ps.c b/drivers/net/wireless/ti/wl1251/ps.c index db719f7..b9e27b9 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;
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> Cc: Luciano Coelho <coelho@ti.com> Cc: linux-wireless@vger.kernel.org --- Please let me know how this patch should be routed. I can take it through the workqueue tree if necessary. Thanks. drivers/net/wireless/ti/wl1251/ps.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)