linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / base / power / suspend.c

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 94c1311..8660779 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -9,10 +9,9 @@
  */
 
 #include <linux/device.h>
+#include "../base.h"
 #include "power.h"
 
-extern int sysdev_suspend(u32 state);
-
 /*
  * The entries in the dpm_active list are in a depth first order, simply
  * because children are guaranteed to be discovered after parents, and
@@ -35,17 +34,31 @@ extern int sysdev_suspend(u32 state);
  *     @state: Power state device is entering.
  */
 
-int suspend_device(struct device * dev, u32 state)
+int suspend_device(struct device * dev, pm_message_t state)
 {
        int error = 0;
 
-       dev_dbg(dev, "suspending\n");
+       down(&dev->sem);
+       if (dev->power.power_state.event) {
+               dev_dbg(dev, "PM: suspend %d-->%d\n",
+                       dev->power.power_state.event, state.event);
+       }
+       if (dev->power.pm_parent
+                       && dev->power.pm_parent->power.power_state.event) {
+               dev_err(dev,
+                       "PM: suspend %d->%d, parent %s already %d\n",
+                       dev->power.power_state.event, state.event,
+                       dev->power.pm_parent->bus_id,
+                       dev->power.pm_parent->power.power_state.event);
+       }
 
        dev->power.prev_state = dev->power.power_state;
 
-       if (dev->bus && dev->bus->suspend && !dev->power.power_state)
+       if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
+               dev_dbg(dev, "suspending\n");
                error = dev->bus->suspend(dev, state);
-
+       }
+       up(&dev->sem);
        return error;
 }
 
@@ -65,7 +78,7 @@ int suspend_device(struct device * dev, u32 state)
  *
  */
 
-int device_suspend(u32 state)
+int device_suspend(pm_message_t state)
 {
        int error = 0;
 
@@ -100,8 +113,19 @@ int device_suspend(u32 state)
                put_device(dev);
        }
        up(&dpm_list_sem);
-       if (error)
+       if (error) {
+               /* we failed... before resuming, bring back devices from
+                * dpm_off_irq list back to main dpm_off list, we do want
+                * to call resume() on them, in case they partially suspended
+                * despite returning -EAGAIN
+                */
+               while (!list_empty(&dpm_off_irq)) {
+                       struct list_head * entry = dpm_off_irq.next;
+                       list_del(entry);
+                       list_add(entry, &dpm_off);
+               }
                dpm_resume();
+       }
        up(&dpm_sem);
        return error;
 }
@@ -118,7 +142,7 @@ EXPORT_SYMBOL_GPL(device_suspend);
  *     done, power down system devices.
  */
 
-int device_power_down(u32 state)
+int device_power_down(pm_message_t state)
 {
        int error = 0;
        struct device * dev;
@@ -134,6 +158,8 @@ int device_power_down(u32 state)
  Done:
        return error;
  Error:
+       printk(KERN_ERR "Could not power down device %s: "
+               "error %d\n", kobject_name(&dev->kobj), error);
        dpm_power_up();
        goto Done;
 }