From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BAB619B5A7 for ; Mon, 20 Oct 2025 13:03:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760965431; cv=none; b=bSvL3Aj1BF1s/A9yWdv4K8hK9sxT54kess2QJTOfXlrfsV1sz79TzbuvfSNJiQV6+uKE8UrxyPErr5f8Vgv9SI5YfKLnInfogpV7oV7KLHYKn2h31zM5+9bOXZSUKAImEzQkunCXJDQLTNNpIiVjIjhPo43k3kLmQevH4g9f6lU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760965431; c=relaxed/simple; bh=1AQcaf0X5hSObmTuCrZzNS6V6h9wACXRNHaW6Q0V7cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hpy291KVqz7BT/7HCTUHgteAPaib1Jblr3lyjgcyF2Zl3oEdC75ojJ70xgEKkfaUypLIr9uEJs0GIrO0hOuqsTkXaEdK85clvgIgh07Ip2oS/OFstCGoNbzAdMbLMvJY+riZD9cyrEz5rehGqh9K7P/7KxbDrNymAXrbpE1YJp8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AGtbX/eE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AGtbX/eE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95053C4CEF9; Mon, 20 Oct 2025 13:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760965431; bh=1AQcaf0X5hSObmTuCrZzNS6V6h9wACXRNHaW6Q0V7cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AGtbX/eEnYxXR77ccEdodnILnTpTiFb9waYuKlqxZ+koR/7r/qMTm0ifZLHpEU35h TeUFAWIB0qsUPvJ9qX6+QtWpHPm2OupdtLrpSghoYaawD4Py3QDUgwvumrFt/IhD+F wn1PGGq9Ta8iWZ+Y228P91kTbhtBfZBEmNuPcH2NG0pHKqhExagdDyiR4ZaDyMNO0N kWGg47Bp/EbTkn+vRrmhStXvzls2HkqoOztn9dbRt+xVfBQ+VVT4PpeKPjl/AIMYkz fiwGmryyywEzgm1zbrVoYAPXEP9MF2fhU9w7b5gHVhzjWGw6nNz2b8V0QoxwuaTHSe EBqQfJzmKk9MA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Bence=20Cs=C3=B3k=C3=A1s?= , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.1.y 1/2] PM: runtime: Add new devm functions Date: Mon, 20 Oct 2025 09:03:47 -0400 Message-ID: <20251020130348.1764406-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025101602-monogram-ferry-a69a@gregkh> References: <2025101602-monogram-ferry-a69a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Bence Csókás [ Upstream commit 73db799bf5efc5a04654bb3ff6c9bf63a0dfa473 ] Add `devm_pm_runtime_set_active_enabled()` and `devm_pm_runtime_get_noresume()` for simplifying common cases in drivers. Signed-off-by: Bence Csókás Link: https://patch.msgid.link/20250327195928.680771-3-csokas.bence@prolan.hu Signed-off-by: Rafael J. Wysocki Stable-dep-of: 0792c1984a45 ("iio: imu: inv_icm42600: Simplify pm_runtime setup") Signed-off-by: Sasha Levin --- drivers/base/power/runtime.c | 44 ++++++++++++++++++++++++++++++++++++ include/linux/pm_runtime.h | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 61d8ebc2de592..d26171bb7c844 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1512,6 +1512,32 @@ void pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(pm_runtime_enable); +static void pm_runtime_set_suspended_action(void *data) +{ + pm_runtime_set_suspended(data); +} + +/** + * devm_pm_runtime_set_active_enabled - set_active version of devm_pm_runtime_enable. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_set_active_enabled(struct device *dev) +{ + int err; + + err = pm_runtime_set_active(dev); + if (err) + return err; + + err = devm_add_action_or_reset(dev, pm_runtime_set_suspended_action, dev); + if (err) + return err; + + return devm_pm_runtime_enable(dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_set_active_enabled); + static void pm_runtime_disable_action(void *data) { pm_runtime_dont_use_autosuspend(data); @@ -1534,6 +1560,24 @@ int devm_pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(devm_pm_runtime_enable); +static void pm_runtime_put_noidle_action(void *data) +{ + pm_runtime_put_noidle(data); +} + +/** + * devm_pm_runtime_get_noresume - devres-enabled version of pm_runtime_get_noresume. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_get_noresume(struct device *dev) +{ + pm_runtime_get_noresume(dev); + + return devm_add_action_or_reset(dev, pm_runtime_put_noidle_action, dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_get_noresume); + /** * pm_runtime_forbid - Block runtime PM of a device. * @dev: Device to handle. diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index b79a1a20d0d9c..5aa46e97903c3 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -95,7 +95,9 @@ extern void pm_runtime_new_link(struct device *dev); extern void pm_runtime_drop_link(struct device_link *link); extern void pm_runtime_release_supplier(struct device_link *link); +int devm_pm_runtime_set_active_enabled(struct device *dev); extern int devm_pm_runtime_enable(struct device *dev); +int devm_pm_runtime_get_noresume(struct device *dev); /** * pm_runtime_get_if_in_use - Conditionally bump up runtime PM usage counter. @@ -292,7 +294,9 @@ static inline void __pm_runtime_disable(struct device *dev, bool c) {} static inline void pm_runtime_allow(struct device *dev) {} static inline void pm_runtime_forbid(struct device *dev) {} +static inline int devm_pm_runtime_set_active_enabled(struct device *dev) { return 0; } static inline int devm_pm_runtime_enable(struct device *dev) { return 0; } +static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; } static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {} static inline void pm_runtime_get_noresume(struct device *dev) {} -- 2.51.0