PM: Remove power_state.event checks from suspend core code

The suspend routines should be called for every device during a system sleep
transition, regardless of the device's state, so that drivers can regard these
method calls as notifications that the system is about to go to sleep, rather
than as directives to put their devices into the 'off' state.

This is documented in Documentation/power/devices.txt and is already done in
the core resume code, so it seems reasonable to make the core suspend code
behave accordingly.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 5178b0fbd82e..a3ff3944832a 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -71,21 +71,19 @@ int suspend_device(struct device * dev, pm_message_t state)
                         dev->parent->power.power_state.event);
         }
 
-        if (dev->class && dev->class->suspend && !dev->power.power_state.event) {
+        if (dev->class && dev->class->suspend) {
                 suspend_device_dbg(dev, state, "class ");
                 error = dev->class->suspend(dev, state);
                 suspend_report_result(dev->class->suspend, error);
         }
 
-        if (!error && dev->type && dev->type->suspend
-            && !dev->power.power_state.event) {
+        if (!error && dev->type && dev->type->suspend) {
                 suspend_device_dbg(dev, state, "type ");
                 error = dev->type->suspend(dev, state);
                 suspend_report_result(dev->type->suspend, error);
         }
 
-        if (!error && dev->bus && dev->bus->suspend
-            && !dev->power.power_state.event) {
+        if (!error && dev->bus && dev->bus->suspend) {
                 suspend_device_dbg(dev, state, "");
                 error = dev->bus->suspend(dev, state);
                 suspend_report_result(dev->bus->suspend, error);
@@ -104,8 +102,7 @@ static int suspend_device_late(struct device *dev, pm_message_t state)
 {
         int error = 0;
 
-        if (dev->bus && dev->bus->suspend_late
-            && !dev->power.power_state.event) {
+        if (dev->bus && dev->bus->suspend_late) {
                 suspend_device_dbg(dev, state, "LATE ");
                 error = dev->bus->suspend_late(dev, state);
                 suspend_report_result(dev->bus->suspend_late, error);