diff options
| author | Tejun Heo <tj@kernel.org> | 2012-12-21 17:57:04 -0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-12-28 13:40:16 -0800 |
| commit | ba0c96cd9a361693b0bae409510d614dc0e26d0f (patch) | |
| tree | b25ac2bece59445bd741a1ed4569756e878b3367 /net/rfkill | |
| parent | 02957f92bcc96be5c84a4000f9d22c592158602e (diff) | |
| download | linux-stable-ba0c96cd9a361693b0bae409510d614dc0e26d0f.tar.gz linux-stable-ba0c96cd9a361693b0bae409510d614dc0e26d0f.tar.bz2 linux-stable-ba0c96cd9a361693b0bae409510d614dc0e26d0f.zip | |
rfkill: 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 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
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/input.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/rfkill/input.c b/net/rfkill/input.c index c9d931e7ffec..b85107b5ef62 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) |