From patchwork Mon Oct 17 18:16:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 77795 Delivered-To: patches@linaro.org Received: by 10.140.97.247 with SMTP id m110csp517985qge; Mon, 17 Oct 2016 11:17:14 -0700 (PDT) X-Received: by 10.25.132.18 with SMTP id g18mr16883931lfd.7.1476728234602; Mon, 17 Oct 2016 11:17:14 -0700 (PDT) Return-Path: Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com. [2a00:1450:4010:c07::233]) by mx.google.com with ESMTPS id x24si19767761lfb.64.2016.10.17.11.17.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 11:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) client-ip=2a00:1450:4010:c07::233; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x233.google.com with SMTP id b75so301178007lfg.3 for ; Mon, 17 Oct 2016 11:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AcTenu9cMwWcK5S/rP6l/9X9q6MR3lGmvvFn2n71Y70=; b=ZfspkIoXqolL7pmg2LC+5QixprU+PJ7PP+WpyiH7f2H2KCWtlaIe9ziZhJNQkAKAGE 7sq3QCv1tNa0DdEPknWSr0ID/Q29+KZ4AfXbP7qjv6opSAbrwhXXse8hVyc/zTm1NqIL CsEtIfHs45JxMoq3AKJ9UHzV1TjAxHQItt/Ys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AcTenu9cMwWcK5S/rP6l/9X9q6MR3lGmvvFn2n71Y70=; b=D9e/JBiZWhkL/gPLlDRklQFd0rIX9uKvuu9eyzw+vYCfk/diNMtyBtOX+Evcm1HVIr jNtukURacbvSl9EMeuKKQEp+GI5D1qZ9geKAIZEIAdaVI00ylNQknsrkxoqQVpBZg8Ub S1lL6viXI4sHbmsdXV5wsZBF7UXIdiXPe+URKBVQZjA4hmERB1dynYAx4Qs7vDZqMoFw /7kNzdU/8DOoYq2mM74x+hdkEdfDs9fQ7eFly2iBUOsBrb2ozH7mf8kMw6SmiYQjx38b C+acpjOzaYwfO5bjji6/Bn73/BSVRhVmivrO+otkjQb9AzdxzXOwtkqHioNsz8PBLPiL cM8g== X-Gm-Message-State: AA6/9RnggU+YkJ7nnfwQOpcu6Ar1mUKUYWP03AAJBnR79ELmT77VeiqAWylI6g7ZUlaZ0LKk2Dk= X-Received: by 10.25.25.84 with SMTP id 81mr9355569lfz.26.1476728234063; Mon, 17 Oct 2016 11:17:14 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id r20sm8230251lfr.19.2016.10.17.11.17.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 11:17:12 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Alan Stern , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Kevin Hilman , Geert Uytterhoeven , Lina Iyer , Jon Hunter , Marek Szyprowski , Linus Walleij Subject: [PATCH 2/4] PM / Runtime: Clarify comment in rpm_resume() when resuming the parent Date: Mon, 17 Oct 2016 20:16:59 +0200 Message-Id: <1476728221-26530-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476728221-26530-1-git-send-email-ulf.hansson@linaro.org> References: <1476728221-26530-1-git-send-email-ulf.hansson@linaro.org> Signed-off-by: Ulf Hansson --- drivers/base/power/runtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 Reviewed-by: Linus Walleij diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 5e4e5ec..f47a345 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -713,8 +713,8 @@ static int rpm_resume(struct device *dev, int rpmflags) spin_lock(&parent->power.lock); /* - * We can resume if the parent's runtime PM is disabled or it - * is set to ignore children. + * Resume the parent if it has runtime PM enabled and not been + * set to ignore its children. */ if (!parent->power.disable_depth && !parent->power.ignore_children) {