summaryrefslogtreecommitdiff
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-07-31 12:05:42 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-08-08 12:25:37 +0300
commit6e86633a791fdf631617ef3a9af3263141d34bc9 (patch)
tree0263f3df0c2ca27f8d45af4f755b5fdef5c11548 /drivers/acpi/ec.c
parentfcd0a04267ac7c5d5f9a27d2af824270f2091760 (diff)
downloadlinux-6e86633a791fdf631617ef3a9af3263141d34bc9.tar.xz
ACPI: PM: s2idle: Eliminate acpi_sleep_no_ec_events()
Change acpi_ec_suspend() to use pm_suspend_no_platform() instead of acpi_sleep_no_ec_events(), which allows the latter to be eliminated along with the s2idle_in_progress variable which is only used by it. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5a38409114d8..be29b9919e2d 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1941,7 +1941,7 @@ static int acpi_ec_suspend(struct device *dev)
struct acpi_ec *ec =
acpi_driver_data(to_acpi_device(dev));
- if (acpi_sleep_no_ec_events() && ec_freeze_events)
+ if (!pm_suspend_no_platform() && ec_freeze_events)
acpi_ec_disable_event(ec);
return 0;
}