diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-07-08 21:38:51 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-07-08 21:38:51 +0300 |
| commit | fe7c758c07c4729a16f940eb1d77027ad032ab29 (patch) | |
| tree | b95dcdfda6934aedf433f563f87eed56386be5c0 /include | |
| parent | ba7c3507087aaf98bbeab04a62251bf63c6348c1 (diff) | |
| parent | 887371066039011144b4a94af97d9328df6869a2 (diff) | |
| download | linux-fe7c758c07c4729a16f940eb1d77027ad032ab29.tar.xz | |
Merge branch 'pm-core'
Merge a runtime PM framework cleanup and fix related to device links.
* pm-core:
PM: runtime: Fix supplier device management during consumer probe
PM: runtime: Redefine pm_runtime_release_supplier()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm_runtime.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 9e4d056967c6..0a41b2dcccad 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -88,7 +88,7 @@ extern void pm_runtime_get_suppliers(struct device *dev); extern void pm_runtime_put_suppliers(struct device *dev); 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, bool check_idle); +extern void pm_runtime_release_supplier(struct device_link *link); extern int devm_pm_runtime_enable(struct device *dev); @@ -314,8 +314,7 @@ static inline void pm_runtime_get_suppliers(struct device *dev) {} static inline void pm_runtime_put_suppliers(struct device *dev) {} static inline void pm_runtime_new_link(struct device *dev) {} static inline void pm_runtime_drop_link(struct device_link *link) {} -static inline void pm_runtime_release_supplier(struct device_link *link, - bool check_idle) {} +static inline void pm_runtime_release_supplier(struct device_link *link) {} #endif /* !CONFIG_PM */ |