From patchwork Tue Jun 8 09:02:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12305951 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D96C8C47082 for ; Tue, 8 Jun 2021 09:04:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BABAC6124B for ; Tue, 8 Jun 2021 09:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231151AbhFHJGO (ORCPT ); Tue, 8 Jun 2021 05:06:14 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:44976 "EHLO mail-lj1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbhFHJGN (ORCPT ); Tue, 8 Jun 2021 05:06:13 -0400 Received: by mail-lj1-f175.google.com with SMTP id d2so21857330ljj.11 for ; Tue, 08 Jun 2021 02:04:07 -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 :mime-version:content-transfer-encoding; bh=cnFHa21pMNW2jSUA5XLazyeCEAKZE26JFLYB4VhYyNQ=; b=IgmBj3uQF/Drcu204B+VWTFpSeocdqBPPSoxqws7142jumL25Uh5R6+dPP3v0J9iDm j5QqH9Ueia7WhFVQ1v7KZarY1H2h/Eq3xB25ZWAf+ABK2kLFWm3LoepZMmcAk1dj7kPJ 46dqfwubP/ws+WPzvXo9LK6LFtc5lpDs+TabH+uCeUi+C5A0gGRZiLboqtFAWmVkmGVw w40ygOPUcdE2e6jgopsgKqAi6jk8FzXRZF/WwTCijJ1nYRib8SmANKg8IVxH+bHIs6Zb AGWWja740laEZ6wEwACI96rsf2teqI61gIyrMTRpymTewlClTj3Jq/AD5nJS9cz1cIos BYGQ== 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:mime-version:content-transfer-encoding; bh=cnFHa21pMNW2jSUA5XLazyeCEAKZE26JFLYB4VhYyNQ=; b=LER+OUEduGfJzwPveg2umcpTK8v3eoQTUxg8v6bBo9v25aCxKoAGVG1b/+/GOYqK/C bA03ubETDcMerRDWiCuwp7DU+0AudGRDVdvvPJxT5ii99zEioxauvlnikFiuKdoyalyL 9SehUzJ8skquLgM8bOXa0kAzlcMacivq7kJ+neG9zz7JzxvWwLN6fY4xvd3cFD4bbK6e XZYpnwc9/LzWUEU4XwrhFANYXei5HCeaAju1fNnSESqhT/51QZ+gPJyfoU4uGzuhJ1q+ +QtL39GRzZuP6VHrn1Pm6NoYtRg1PNPCmVqXa5NTAOAbdns6bheWw4s/DKsjEuCjYcvf ycOQ== X-Gm-Message-State: AOAM532dkvGcMu8BO5riXZ61gMmzYGNE+U021+NiBRGhWxDYGREVhbBz VTtvv7jTQW35YW+vie98x9iGKA== X-Google-Smtp-Source: ABdhPJwI7y00opt25k6XFPvLGoi/PJ+2CRkZfM2+49l59Hp/hIZD5O6F5RgnDnBcP7p2eJIkt8skQg== X-Received: by 2002:a05:651c:1138:: with SMTP id e24mr17675880ljo.403.1623142986144; Tue, 08 Jun 2021 02:03:06 -0700 (PDT) Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id n17sm1295197lfq.118.2021.06.08.02.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 02:03:05 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Ulf Hansson , Saravana Kannan , Alan Stern , Adrian Hunter , Tony Lindgren , Kevin Hilman , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] PM: runtime: Allow unassigned ->runtime_suspend|resume callbacks Date: Tue, 8 Jun 2021 11:02:49 +0200 Message-Id: <20210608090250.85256-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210608090250.85256-1-ulf.hansson@linaro.org> References: <20210608090250.85256-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org We are currently allowing ->runtime_idle() callbacks to be unassigned without returning an error code from rpm_idle(). This has been useful to avoid boilerplate code in drivers. Let's take this approach a step further, by allowing also unassigned ->runtime_suspend|resume() callbacks. In this way, a consumer/supplier device link can be used to let a consumer device be power managed through its supplier device, without requiring assigned ->runtime_suspend|resume() callbacks for the consumer device, for example. Signed-off-by: Ulf Hansson --- Changes in v2: - Small updates to commit message. --- drivers/base/power/runtime.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 68bebbf81347..8a66eaf731e4 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -345,7 +345,7 @@ static void rpm_suspend_suppliers(struct device *dev) static int __rpm_callback(int (*cb)(struct device *), struct device *dev) __releases(&dev->power.lock) __acquires(&dev->power.lock) { - int retval, idx; + int retval = 0, idx; bool use_links = dev->power.links_count > 0; if (dev->power.irq_safe) { @@ -373,7 +373,8 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev) } } - retval = cb(dev); + if (cb) + retval = cb(dev); if (dev->power.irq_safe) { spin_lock(&dev->power.lock); @@ -484,9 +485,6 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev) { int retval; - if (!cb) - return -ENOSYS; - if (dev->power.memalloc_noio) { unsigned int noio_flag;