From d9c187b0bf89faeed6acaf9905282bad572371e1 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 11 Jan 2013 13:37:33 +0100 Subject: [PATCH] --- yaml --- r: 350995 b: refs/heads/master c: ed1ac6e91a3ff7c561008ba57747cd6cbc49385e h: refs/heads/master i: 350993: 734345e0fbb980e6ab7538c03d752154b8770654 350991: 20c3b51e74cf0cd2c0554409935780d6294cad0d v: v3 --- [refs] | 2 +- trunk/kernel/power/autosleep.c | 2 +- trunk/kernel/power/qos.c | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a17ea7b40214..4c95177c0233 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4ca26a43e39d521b3913f09faf82dfbbbca5f6a +refs/heads/master: ed1ac6e91a3ff7c561008ba57747cd6cbc49385e diff --git a/trunk/kernel/power/autosleep.c b/trunk/kernel/power/autosleep.c index ca304046d9e2..c6422ffeda9a 100644 --- a/trunk/kernel/power/autosleep.c +++ b/trunk/kernel/power/autosleep.c @@ -66,7 +66,7 @@ static DECLARE_WORK(suspend_work, try_to_suspend); void queue_up_suspend_work(void) { - if (!work_pending(&suspend_work) && autosleep_state > PM_SUSPEND_ON) + if (autosleep_state > PM_SUSPEND_ON) queue_work(autosleep_wq, &suspend_work); } diff --git a/trunk/kernel/power/qos.c b/trunk/kernel/power/qos.c index 9322ff7eaad6..587dddeebf15 100644 --- a/trunk/kernel/power/qos.c +++ b/trunk/kernel/power/qos.c @@ -359,8 +359,7 @@ void pm_qos_update_request(struct pm_qos_request *req, return; } - if (delayed_work_pending(&req->work)) - cancel_delayed_work_sync(&req->work); + cancel_delayed_work_sync(&req->work); if (new_value != req->node.prio) pm_qos_update_target( @@ -386,8 +385,7 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, s32 new_value, "%s called for unknown object.", __func__)) return; - if (delayed_work_pending(&req->work)) - cancel_delayed_work_sync(&req->work); + cancel_delayed_work_sync(&req->work); if (new_value != req->node.prio) pm_qos_update_target( @@ -416,8 +414,7 @@ void pm_qos_remove_request(struct pm_qos_request *req) return; } - if (delayed_work_pending(&req->work)) - cancel_delayed_work_sync(&req->work); + cancel_delayed_work_sync(&req->work); pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints, &req->node, PM_QOS_REMOVE_REQ,