summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-31 18:24:38 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-31 18:24:38 +0100
commit5ba257249e9c8cb2c670e22b0f02d1806f349102 (patch)
tree022ea803b7fb11a423f40eaeca347e69d86fda3f /include/linux
parent2a9a86d5c81389cd9afe6a4fea42c585733cd705 (diff)
downloadlinux-stable-5ba257249e9c8cb2c670e22b0f02d1806f349102.tar.gz
linux-stable-5ba257249e9c8cb2c670e22b0f02d1806f349102.tar.bz2
linux-stable-5ba257249e9c8cb2c670e22b0f02d1806f349102.zip
Revert "PM / QoS: Fix default runtime_pm device resume latency"
This reverts commit 2a9a86d5c813 (PM / QoS: Fix default runtime_pm device resume latency) as the commit it depends on is going to be reverted. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pm_qos.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index d68b0569a5eb..6737a8c9e8c6 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -175,8 +175,7 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)
static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
{
return IS_ERR_OR_NULL(dev->power.qos) ?
- PM_QOS_RESUME_LATENCY_NO_CONSTRAINT :
- pm_qos_read_value(&dev->power.qos->resume_latency);
+ 0 : pm_qos_read_value(&dev->power.qos->resume_latency);
}
#else
static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,