History

Merge branches 'pm-core', 'pm-sleep', 'pm-acpi' and 'pm-domains'

* pm-core: PM: runtime: Add pm_runtime_get_if_active() * pm-sleep: PM: sleep: wakeup: Skip wakeup_source_sysfs_remove() if device is not there PM / hibernate: Remove unnecessary compat ioctl overrides PM: hibernate: fix docs for ioctls that return loff_t via pointer PM: sleep: wakeup: Use built-in RCU list checking PM: sleep: core: Use built-in RCU list checking * pm-acpi: ACPI: PM: s2idle: Refine active GPEs check ACPICA: Allow acpi_any_gpe_status_set() to skip one GPE ACPI: PM: s2idle: Fix comment in acpi_s2idle_prepare_late() * pm-domains: cpuidle: psci: Split psci_dt_cpu_init_idle() PM / Domains: Allow no domain-idle-states DT property in genpd when parsing

Rafael J. Wysocki committed 6 years ago

Commit ada06295 parents 0411f0d c111566 87de659 d540628 7fbee4816 files · +166 −87Browse files

Showing the changes to include/linux (1 of 16 files). Show all

Unified · Split

include/linux/pm_runtime.h+11−1
@@ -38,7 +38,7 @@ extern int pm_runtime_force_resume(struct device *dev); · 37 unmodified lines
3838 extern int __pm_runtime_idle(struct device *dev, int rpmflags);
3939 extern int __pm_runtime_suspend(struct device *dev, int rpmflags);
4040 extern int __pm_runtime_resume(struct device *dev, int rpmflags);
41−extern int pm_runtime_get_if_in_use(struct device *dev);
41+extern int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count);
4242 extern int pm_schedule_suspend(struct device *dev, unsigned int delay);
4343 extern int __pm_runtime_set_status(struct device *dev, unsigned int status);
4444 extern int pm_runtime_barrier(struct device *dev);
@@ -60,6 +60,11 @@ extern void pm_runtime_put_suppliers(struct device *dev); · 15 unmodified lines
6060 extern void pm_runtime_new_link(struct device *dev);
6161 extern void pm_runtime_drop_link(struct device *dev);
6262
63+static inline int pm_runtime_get_if_in_use(struct device *dev)
64+{
65+ return pm_runtime_get_if_active(dev, false);
66+}
67+
6368 static inline void pm_suspend_ignore_children(struct device *dev, bool enable)
6469 {
6570 dev->power.ignore_children = enable;
@@ -143,6 +148,11 @@ static inline int pm_runtime_get_if_in_use(struct device *dev) · 77 unmodified lines
143148 {
144149 return -EINVAL;
145150 }
151+static inline int pm_runtime_get_if_active(struct device *dev,
152+ bool ign_usage_count)
153+{
154+ return -EINVAL;
155+}
146156 static inline int __pm_runtime_set_status(struct device *dev,
147157 unsigned int status) { return 0; }
148158 static inline int pm_runtime_barrier(struct device *dev) { return 0; }