diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
| commit | db25f440f42eca380fcdb339f51cf73633e32485 (patch) | |
| tree | d67c8ec502c2ce8b1382538545ee1b8a439dc6e2 /include/linux/pm_runtime.h | |
| parent | 145d92e77e6f34f53773fdb06789816ec2b6c7b3 (diff) | |
| parent | 83510441bc08bee201c0ded9d81da6dfd008d69a (diff) | |
| download | linux-db25f440f42eca380fcdb339f51cf73633e32485.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/pm_runtime.h')
| -rw-r--r-- | include/linux/pm_runtime.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 30e84d48bfea..3bdbb4189780 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -98,11 +98,6 @@ static inline bool pm_runtime_status_suspended(struct device *dev) return dev->power.runtime_status == RPM_SUSPENDED; } -static inline bool pm_runtime_suspended_if_enabled(struct device *dev) -{ - return pm_runtime_status_suspended(dev) && dev->power.disable_depth == 1; -} - static inline bool pm_runtime_enabled(struct device *dev) { return !dev->power.disable_depth; @@ -164,7 +159,6 @@ static inline void device_set_run_wake(struct device *dev, bool enable) {} static inline bool pm_runtime_suspended(struct device *dev) { return false; } static inline bool pm_runtime_active(struct device *dev) { return true; } static inline bool pm_runtime_status_suspended(struct device *dev) { return false; } -static inline bool pm_runtime_suspended_if_enabled(struct device *dev) { return false; } static inline bool pm_runtime_enabled(struct device *dev) { return false; } static inline void pm_runtime_no_callbacks(struct device *dev) {} |