diff options
| author | Tejun Heo <tj@kernel.org> | 2013-01-11 07:37:33 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-25 18:39:11 -0500 |
| commit | ed1ac6e91a3ff7c561008ba57747cd6cbc49385e (patch) | |
| tree | 52598ded2a8bea2486170169b4687ad8aadf8a67 /kernel/power/qos.c | |
| parent | a4ca26a43e39d521b3913f09faf82dfbbbca5f6a (diff) | |
PM: don't use [delayed_]work_pending()
There's no need to test whether a (delayed) work item is pending
before queueing, flushing or cancelling it, so remove work_pending()
tests used in those cases.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power/qos.c')
| -rw-r--r-- | kernel/power/qos.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 9322ff7eaad6..587dddeebf15 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c | |||
| @@ -359,8 +359,7 @@ void pm_qos_update_request(struct pm_qos_request *req, | |||
| 359 | return; | 359 | return; |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | if (delayed_work_pending(&req->work)) | 362 | cancel_delayed_work_sync(&req->work); |
| 363 | cancel_delayed_work_sync(&req->work); | ||
| 364 | 363 | ||
| 365 | if (new_value != req->node.prio) | 364 | if (new_value != req->node.prio) |
| 366 | pm_qos_update_target( | 365 | pm_qos_update_target( |
| @@ -386,8 +385,7 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, s32 new_value, | |||
| 386 | "%s called for unknown object.", __func__)) | 385 | "%s called for unknown object.", __func__)) |
| 387 | return; | 386 | return; |
| 388 | 387 | ||
| 389 | if (delayed_work_pending(&req->work)) | 388 | cancel_delayed_work_sync(&req->work); |
| 390 | cancel_delayed_work_sync(&req->work); | ||
| 391 | 389 | ||
| 392 | if (new_value != req->node.prio) | 390 | if (new_value != req->node.prio) |
| 393 | pm_qos_update_target( | 391 | pm_qos_update_target( |
| @@ -416,8 +414,7 @@ void pm_qos_remove_request(struct pm_qos_request *req) | |||
| 416 | return; | 414 | return; |
| 417 | } | 415 | } |
| 418 | 416 | ||
| 419 | if (delayed_work_pending(&req->work)) | 417 | cancel_delayed_work_sync(&req->work); |
| 420 | cancel_delayed_work_sync(&req->work); | ||
| 421 | 418 | ||
| 422 | pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints, | 419 | pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints, |
| 423 | &req->node, PM_QOS_REMOVE_REQ, | 420 | &req->node, PM_QOS_REMOVE_REQ, |