diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-11-23 12:49:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-11-23 12:49:28 +0100 |
| commit | 0f6e2cb45bcb003e5b3a5332b4de79bf82814f45 (patch) | |
| tree | aaf4d99f737b788f711b517794c28826bb32e9a3 /include/linux | |
| parent | cpuidle: tegra: Annotate tegra_pm_set_cpu_in_lp2() with RCU_NONIDLE (diff) | |
| parent | cpuidle: psci: Enable suspend-to-idle for PSCI OSI mode (diff) | |
| download | wireguard-linux-0f6e2cb45bcb003e5b3a5332b4de79bf82814f45.tar.xz wireguard-linux-0f6e2cb45bcb003e5b3a5332b4de79bf82814f45.zip | |
Merge back cpuidle changes for v5.11.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm_domain.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 1ad0ec481416..a8f93328daec 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -280,11 +280,11 @@ static inline int dev_pm_genpd_remove_notifier(struct device *dev) #endif #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP -void pm_genpd_syscore_poweroff(struct device *dev); -void pm_genpd_syscore_poweron(struct device *dev); +void dev_pm_genpd_suspend(struct device *dev); +void dev_pm_genpd_resume(struct device *dev); #else -static inline void pm_genpd_syscore_poweroff(struct device *dev) {} -static inline void pm_genpd_syscore_poweron(struct device *dev) {} +static inline void dev_pm_genpd_suspend(struct device *dev) {} +static inline void dev_pm_genpd_resume(struct device *dev) {} #endif /* OF PM domain providers */ |