summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-09-16 15:49:33 -0400
committerTejun Heo <tj@kernel.org>2016-09-17 13:18:21 -0400
commita81f80f3eb759de72d74d18e478873fc0575abc5 (patch)
tree54a46c8cf8aa65df4e2683d656587affe4a7cb15 /kernel/power
parent1bb0802460da42cd552e03060a65e3f303905088 (diff)
downloadlinux-a81f80f3eb759de72d74d18e478873fc0575abc5.tar.bz2
power, workqueue: remove keventd_up() usage
Now that workqueue can handle work item queueing/cancelling from very early during boot, there is no need to gate cancel_delayed_work_sync() while !keventd_up(). Remove it. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Qiao Zhou <qiaozhou@asrmicro.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/qos.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 168ff442ebde..97b0df71303e 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -482,16 +482,7 @@ void pm_qos_update_request(struct pm_qos_request *req,
return;
}
- /*
- * This function may be called very early during boot, for example,
- * from of_clk_init(), where irq needs to stay disabled.
- * cancel_delayed_work_sync() assumes that irq is enabled on
- * invocation and re-enables it on return. Avoid calling it until
- * workqueue is initialized.
- */
- if (keventd_up())
- cancel_delayed_work_sync(&req->work);
-
+ cancel_delayed_work_sync(&req->work);
__pm_qos_update_request(req, new_value);
}
EXPORT_SYMBOL_GPL(pm_qos_update_request);