Messages in this thread Patch in this message | | | From | Tejun Heo <> | Subject | [PATCH 14/25] rfkill: don't use [delayed_]work_pending() | Date | Fri, 21 Dec 2012 17:57:04 -0800 |
| |
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 rfkill. Only compile tested.
Signed-off-by: Tejun Heo <tj@kernel.org> Cc: "John W. Linville" <linville@tuxdriver.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.
net/rfkill/input.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/rfkill/input.c b/net/rfkill/input.c index c9d931e..b85107b 100644 --- a/net/rfkill/input.c +++ b/net/rfkill/input.c @@ -148,11 +148,9 @@ static unsigned long rfkill_ratelimit(const unsigned long last) static void rfkill_schedule_ratelimited(void) { - if (delayed_work_pending(&rfkill_op_work)) - return; - schedule_delayed_work(&rfkill_op_work, - rfkill_ratelimit(rfkill_last_scheduled)); - rfkill_last_scheduled = jiffies; + if (schedule_delayed_work(&rfkill_op_work, + rfkill_ratelimit(rfkill_last_scheduled))) + rfkill_last_scheduled = jiffies; } static void rfkill_schedule_global_op(enum rfkill_sched_op op) -- 1.8.0.2
| |