Merge tag 'pm-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit d46bca632ca4 · 2021-12-10T14:36:06.000-08:00
Pull power management fix from Rafael Wysocki:
 "Fix a kernedoc comment that doesn't match the behavior of the function
  documented by it"

* tag 'pm-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: runtime: Fix pm_runtime_active() kerneldoc comment
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
@@ -129,7 +129,7 @@ static inline bool pm_runtime_suspended(struct device *dev)
  * pm_runtime_active - Check whether or not a device is runtime-active.
  * @dev: Target device.
  *
- * Return %true if runtime PM is enabled for @dev and its runtime PM status is
+ * Return %true if runtime PM is disabled for @dev or its runtime PM status is
  * %RPM_ACTIVE, or %false otherwise.
  *
  * Note that the return value of this function can only be trusted if it is

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ static inline bool pm_runtime_suspended(struct device *dev)`
`129`	`129`	`* pm_runtime_active - Check whether or not a device is runtime-active.`
`130`	`130`	`* @dev: Target device.`
`131`	`131`	`*`
`132`		`- * Return %true if runtime PM is enabled for @dev and its runtime PM status is`
	`132`	`+ * Return %true if runtime PM is disabled for @dev or its runtime PM status is`
`133`	`133`	`* %RPM_ACTIVE, or %false otherwise.`
`134`	`134`	`*`
`135`	`135`	`* Note that the return value of this function can only be trusted if it is`