Skip to content

Commit

Permalink
PM: Remove power_state.event checks from suspend core code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki authored and Greg Kroah-Hartman committed Jul 11, 2007
1 parent 515c535 commit 1c3f7d1
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/base/power/suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 1c3f7d1

Please sign in to comment.