Skip to content

Commit

Permalink
rfkill: don't use [delayed_]work_pending()
Browse files Browse the repository at this point in the history
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>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
  • Loading branch information
Tejun Heo committed Dec 28, 2012
1 parent 02957f9 commit ba0c96c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions net/rfkill/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ba0c96c

Please sign in to comment.