From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932469AbcIOTbR (ORCPT ); Thu, 15 Sep 2016 15:31:17 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:33736 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029AbcIOTaj (ORCPT ); Thu, 15 Sep 2016 15:30:39 -0400 From: Tejun Heo To: torvalds@linux-foundation.org Cc: linux-kernel@vger.kernel.org, jiangshanlai@gmail.com, akpm@linux-foundation.org, kernel-team@fb.com, Tejun Heo , Qiao Zhou , "Rafael J . Wysocki" Subject: [PATCH 4/7] power, workqueue: remove keventd_up() usage Date: Thu, 15 Sep 2016 15:30:18 -0400 Message-Id: <1473967821-24363-5-git-send-email-tj@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473967821-24363-1-git-send-email-tj@kernel.org> References: <1473967821-24363-1-git-send-email-tj@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Qiao Zhou Cc: Rafael J. Wysocki --- Hello, This change depends on an earlier workqueue patch and is followed by a patch to remove keventd_up(). It'd be great if it can be routed through the wq/for-4.9 branch. Thanks. kernel/power/qos.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 168ff44..97b0df7 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); -- 2.7.4