summaryrefslogtreecommitdiff
path: root/Documentation/power/runtime_pm.rst
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2024-09-30 11:49:10 +0300
committerJani Nikula <jani.nikula@intel.com>2024-09-30 11:49:10 +0300
commite0568571258d096f0277c74185bcbfc9cf21bccb (patch)
treea380953643dbb86bffaa862d11e58eba22697988 /Documentation/power/runtime_pm.rst
parent9d5a05f86d2f4f81abcac6abc856c0d511a8607b (diff)
parent9852d85ec9d492ebef56dc5f229416c925758edc (diff)
Merge drm/drm-next into drm-intel-next
Sync to v6.12-rc1. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Documentation/power/runtime_pm.rst')
-rw-r--r--Documentation/power/runtime_pm.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.rst b/Documentation/power/runtime_pm.rst
index 5c4e730f38d0..53d1996460ab 100644
--- a/Documentation/power/runtime_pm.rst
+++ b/Documentation/power/runtime_pm.rst
@@ -811,8 +811,8 @@ subsystem-level dev_pm_ops structure.
Device drivers that wish to use the same function as a system suspend, freeze,
poweroff and runtime suspend callback, and similarly for system resume, thaw,
-restore, and runtime resume, can achieve this with the help of the
-UNIVERSAL_DEV_PM_OPS macro defined in include/linux/pm.h (possibly setting its
+restore, and runtime resume, can achieve similar behaviour with the help of the
+DEFINE_RUNTIME_DEV_PM_OPS() defined in include/linux/pm_runtime.h (possibly setting its
last argument to NULL).
8. "No-Callback" Devices