diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-17 01:29:58 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-17 01:29:58 +0300 |
| commit | 048f35ff26a6c1b7297b43ec4376d9fa1872b4a9 (patch) | |
| tree | b74634397306fb357a5d565e2b76bf199ce33106 /drivers/acpi | |
| parent | eeb2d80d502af28e5660ff4bbe00f90ceb82c2db (diff) | |
| parent | 20f97caf1120bd02e8ff4adbad3b44b63626feb5 (diff) | |
| download | linux-048f35ff26a6c1b7297b43ec4376d9fa1872b4a9.tar.xz | |
Merge branch 'pm-qos' into acpi-pm
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/device_pm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 764b8dfa04aa..d74000acb658 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) |