Skip to content

Commit cd8198a

Browse files
committed
Merge branch 'pm-domains'
Merge generlic power domains update for 5.19-rc1: - Extend dev_pm_domain_detach() doc (Krzysztof Kozlowski). - Move genpd's time-accounting to ktime_get_mono_fast_ns() (Ulf Hansson). - Improve the way genpd deals with its governors (Ulf Hansson). * pm-domains: PM: domains: Trust domain-idle-states from DT to be correct by genpd PM: domains: Measure power-on/off latencies in genpd based on a governor PM: domains: Allocate governor data dynamically based on a genpd governor PM: domains: Clean up some code in pm_genpd_init() and genpd_remove() PM: domains: Fix initialization of genpd's next_wakeup PM: domains: Fixup QoS latency measurements for IRQ safe devices in genpd PM: domains: Measure suspend/resume latencies in genpd based on governor PM: domains: Move the next_wakeup variable into the struct gpd_timing_data PM: domains: Allocate gpd_timing_data dynamically based on governor PM: domains: Skip another warning in irq_safe_dev_in_sleep_domain() PM: domains: Rename irq_safe_dev_in_no_sleep_domain() in genpd PM: domains: Don't check PM_QOS_FLAG_NO_POWER_OFF in genpd PM: domains: Drop redundant code for genpd always-on governor PM: domains: Add GENPD_FLAG_RPM_ALWAYS_ON for the always-on governor PM: domains: Move genpd's time-accounting to ktime_get_mono_fast_ns() PM: domains: Extend dev_pm_domain_detach() doc
2 parents d988c91 + b2a92f3 commit cd8198a

File tree

4 files changed

+223
-152
lines changed

4 files changed

+223
-152
lines changed

drivers/base/power/common.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ EXPORT_SYMBOL_GPL(dev_pm_domain_attach_by_name);
172172
* @dev: Device to detach.
173173
* @power_off: Used to indicate whether we should power off the device.
174174
*
175-
* This functions will reverse the actions from dev_pm_domain_attach() and
176-
* dev_pm_domain_attach_by_id(), thus it detaches @dev from its PM domain.
177-
* Typically it should be invoked during the remove phase, either from
178-
* subsystem level code or from drivers.
175+
* This functions will reverse the actions from dev_pm_domain_attach(),
176+
* dev_pm_domain_attach_by_id() and dev_pm_domain_attach_by_name(), thus it
177+
* detaches @dev from its PM domain. Typically it should be invoked during the
178+
* remove phase, either from subsystem level code or from drivers.
179179
*
180180
* Callers must ensure proper synchronization of this function with power
181181
* management callbacks.

0 commit comments

Comments
 (0)