From patchwork Mon Nov 13 15:46:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10056319 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BD24D60365 for ; Mon, 13 Nov 2017 15:46:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF5C629237 for ; Mon, 13 Nov 2017 15:46:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A40C929419; Mon, 13 Nov 2017 15:46:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03CDD29237 for ; Mon, 13 Nov 2017 15:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752513AbdKMPqx (ORCPT ); Mon, 13 Nov 2017 10:46:53 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:55150 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753157AbdKMPqw (ORCPT ); Mon, 13 Nov 2017 10:46:52 -0500 Received: by mail-lf0-f65.google.com with SMTP id a2so18864145lfh.11 for ; Mon, 13 Nov 2017 07:46:51 -0800 (PST) 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=Z6bveg9k5fuh6Zc3zXkVbIClpgXuD92B/ZJ5LBm0oEA=; b=axzqIC21UUrAiobfexalgdfWCbtSEgQaDrD1hf3JbbXAKjwITCkzFbunvExsTpHLyN YWHVnv9Mo3NzWX+ammE2/SSx0gKDUAQOAyqbEKkRzKAvp6Yo00CwdpFAUbpuvbIYzDOR 7SFs28mkExJxZHGEWKxG2hxK/YgbvP62V4yRc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Z6bveg9k5fuh6Zc3zXkVbIClpgXuD92B/ZJ5LBm0oEA=; b=VaYH9k/q2V6w3dwrPeM+Ic3UXSwX2634MY2vwBGTyupRZdpRccLJjXOcDOrQKiSw7S ZYdetxOWTGBsgHeukBk3fHhhEYJYC4ZLgTs/VIBYHT+totclSiEqEEkdrvKOqC42XeOk dr03MxJ1Q3OXDTFkIvO7KS/V3VuNigoFpp19qtGqYdi1Lon1YBV3SRuWAwMo7ckYvltZ Y3QV/fUIqJ1yqZBWQ/ATOJWtCj4Z8pMXGv8HCrPeKeW5f90uobf2Wig76cTgGTyz4Eqe VwQSqvZRJF6+2+GotnE3ijEoD4beFSzvzBkaF8pl7d5wDtYnkF91v2MLsgI5Qa1dPVMU EiPQ== X-Gm-Message-State: AJaThX5EWtDyipun7RJpZyue9i71tsO41gZPDXRNu5ozerG6XBHua9Z5 kUpCC8l7r/5Zatm4UvgGcxzdVw== X-Google-Smtp-Source: AGs4zMbOlCK49SxzKGM+sdyivoPsIgfIY8c7LAS+4Fir7yJoCxx/0qarD2Cn2MZ5kaBuiWI+vov4UQ== X-Received: by 10.25.193.81 with SMTP id r78mr2980762lff.187.1510588011263; Mon, 13 Nov 2017 07:46:51 -0800 (PST) Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id m26sm177841ljb.61.2017.11.13.07.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Nov 2017 07:46:50 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Kevin Hilman , Viresh Kumar , Geert Uytterhoeven , Simon Horman , Niklas Soderlund , linux-renesas-soc@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 1/3] PM / core: Re-factor some code dealing with parents in __device_suspend() Date: Mon, 13 Nov 2017 16:46:41 +0100 Message-Id: <1510588003-16650-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510588003-16650-1-git-send-email-ulf.hansson@linaro.org> References: <1510588003-16650-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Let's make the code a bit more readable by moving some of the code, which deals with adjustments for parent devices in __device_suspend(), into its own function. Signed-off-by: Ulf Hansson Reviewed-by: Geert Uytterhoeven --- Changes in v2: - Added Geert's Reviewed-by tag. --- drivers/base/power/main.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6c6f1c7..8089e72 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1422,6 +1422,22 @@ static int legacy_suspend(struct device *dev, pm_message_t state, return error; } +static void dpm_propagate_to_parent(struct device *dev) +{ + struct device *parent = dev->parent; + + if (!parent) + return; + + spin_lock_irq(&parent->power.lock); + + parent->power.direct_complete = false; + if (dev->power.wakeup_path && !parent->power.ignore_children) + parent->power.wakeup_path = true; + + spin_unlock_irq(&parent->power.lock); +} + static void dpm_clear_suppliers_direct_complete(struct device *dev) { struct device_link *link; @@ -1530,19 +1546,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) End: if (!error) { - struct device *parent = dev->parent; - dev->power.is_suspended = true; - if (parent) { - spin_lock_irq(&parent->power.lock); - - dev->parent->power.direct_complete = false; - if (dev->power.wakeup_path - && !dev->parent->power.ignore_children) - dev->parent->power.wakeup_path = true; - - spin_unlock_irq(&parent->power.lock); - } + dpm_propagate_to_parent(dev); dpm_clear_suppliers_direct_complete(dev); }