ACPI / PM: Consolidate device wakeup settings code

Currently, there are two separate ways of handling device wakeup
settings in the ACPI core, depending on whether this is runtime
wakeup or system wakeup (from sleep states).  However, after the
previous commit eliminating the run_wake ACPI device wakeup flag,
there is no difference between the two any more at the ACPI level,
so they can be combined.

For this reason, introduce acpi_pm_set_device_wakeup() to replace both
acpi_pm_device_run_wake() and acpi_pm_device_sleep_wake() and make it
check the ACPI device object's wakeup.valid flag to determine whether
or not the device can be set up to generate wakeup signals.

Also notice that zpodd_enable/disable_run_wake() only call
device_set_run_wake() because acpi_pm_device_run_wake() called
device_run_wake(), which is not done by acpi_pm_set_device_wakeup(),
so drop the now redundant device_set_run_wake() calls from there.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 9113876487ed..3a4c1aa0201e 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -149,8 +149,8 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
         }
 
         if (device_can_wakeup(&dev->dev)) {
-                error = acpi_pm_device_sleep_wake(&dev->dev,
-                                device_may_wakeup(&dev->dev));
+                error = acpi_pm_set_device_wakeup(&dev->dev,
+                                              device_may_wakeup(&dev->dev));
                 if (error)
                         return error;
         }
@@ -185,7 +185,7 @@ static int pnpacpi_resume(struct pnp_dev *dev)
         }
 
         if (device_may_wakeup(&dev->dev))
-                acpi_pm_device_sleep_wake(&dev->dev, false);
+                acpi_pm_set_device_wakeup(&dev->dev, false);
 
         if (acpi_device_power_manageable(acpi_dev))
                 error = acpi_device_set_power(acpi_dev, ACPI_STATE_D0);