Skip to content

Commit ed1ac6e

Browse files
htejunrafaeljw
authored andcommitted
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 <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a4ca26a commit ed1ac6e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

kernel/power/autosleep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static DECLARE_WORK(suspend_work, try_to_suspend);
6666

6767
void queue_up_suspend_work(void)
6868
{
69-
if (!work_pending(&suspend_work) && autosleep_state > PM_SUSPEND_ON)
69+
if (autosleep_state > PM_SUSPEND_ON)
7070
queue_work(autosleep_wq, &suspend_work);
7171
}
7272

kernel/power/qos.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ void pm_qos_update_request(struct pm_qos_request *req,
359359
return;
360360
}
361361

362-
if (delayed_work_pending(&req->work))
363-
cancel_delayed_work_sync(&req->work);
362+
cancel_delayed_work_sync(&req->work);
364363

365364
if (new_value != req->node.prio)
366365
pm_qos_update_target(
@@ -386,8 +385,7 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, s32 new_value,
386385
"%s called for unknown object.", __func__))
387386
return;
388387

389-
if (delayed_work_pending(&req->work))
390-
cancel_delayed_work_sync(&req->work);
388+
cancel_delayed_work_sync(&req->work);
391389

392390
if (new_value != req->node.prio)
393391
pm_qos_update_target(
@@ -416,8 +414,7 @@ void pm_qos_remove_request(struct pm_qos_request *req)
416414
return;
417415
}
418416

419-
if (delayed_work_pending(&req->work))
420-
cancel_delayed_work_sync(&req->work);
417+
cancel_delayed_work_sync(&req->work);
421418

422419
pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints,
423420
&req->node, PM_QOS_REMOVE_REQ,

0 commit comments

Comments
 (0)