summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:33:48 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:33:48 +0100
commit4762573b934cced83b91950f0e7a9f160e3983e3 (patch)
tree3ab9a54af2bf2f66776b020eee4f7dbe897912b0 /drivers/acpi
parentMerge branch 'pm-domains' (diff)
parentPM / QoS: Fix device resume latency framework (diff)
downloadlinux-4762573b934cced83b91950f0e7a9f160e3983e3.tar.xz
linux-4762573b934cced83b91950f0e7a9f160e3983e3.zip
Merge branch 'pm-qos'
* pm-qos: PM / QoS: Fix device resume latency framework PM / QoS: Drop PM_QOS_FLAG_REMOTE_WAKEUP
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/device_pm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index fbcc73f7a099..e8c820129797 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -581,8 +581,7 @@ static int acpi_dev_pm_get_state(struct device *dev, struct acpi_device *adev,
d_min = ret;
wakeup = device_may_wakeup(dev) && adev->wakeup.flags.valid
&& adev->wakeup.sleep_state >= target_state;
- } else if (dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) !=
- PM_QOS_FLAGS_NONE) {
+ } else {
wakeup = adev->wakeup.flags.valid;
}
@@ -865,8 +864,7 @@ int acpi_dev_runtime_suspend(struct device *dev)
if (!adev)
return 0;
- remote_wakeup = dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) >
- PM_QOS_FLAGS_NONE;
+ remote_wakeup = acpi_device_can_wakeup(adev);
if (remote_wakeup) {
error = acpi_device_wakeup_enable(adev, ACPI_STATE_S0);
if (error)