Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index bdb60663f2eff5e9243921d8c0e144b8f1c7cd17..69509e02f703c6a32a9c158f70cf558bf70d77cb 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -8,8 +8,9 @@
  *
  */
 
-#include <linux/vt_kern.h>
 #include <linux/device.h>
+#include <linux/kallsyms.h>
+#include <linux/pm.h>
 #include "../base.h"
 #include "power.h"
 
@@ -28,6 +29,15 @@
  * lists. This way, the ancestors will be accessed before their descendents.
  */
 
+static inline char *suspend_verb(u32 event)
+{
+       switch (event) {
+       case PM_EVENT_SUSPEND:  return "suspend";
+       case PM_EVENT_FREEZE:   return "freeze";
+       default:                return "(unknown suspend event)";
+       }
+}
+
 
 /**
  *     suspend_device - Save state of one device.
@@ -56,13 +66,21 @@ int suspend_device(struct device * dev, pm_message_t state)
        dev->power.prev_state = dev->power.power_state;
 
        if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
-               dev_dbg(dev, "suspending\n");
+               dev_dbg(dev, "%s%s\n",
+                       suspend_verb(state.event),
+                       ((state.event == PM_EVENT_SUSPEND)
+                                       && device_may_wakeup(dev))
+                               ? ", may wakeup"
+                               : ""
+                       );
                error = dev->bus->suspend(dev, state);
+               suspend_report_result(dev->bus->suspend, error);
        }
        up(&dev->sem);
        return error;
 }
 
+
 /**
  *     device_suspend - Save state and stop all devices in system.
  *     @state:         Power state to put each device in.
@@ -82,9 +100,6 @@ int device_suspend(pm_message_t state)
 {
        int error = 0;
 
-       if (!is_console_suspend_safe())
-               return -EINVAL;
-
        down(&dpm_sem);
        down(&dpm_list_sem);
        while (!list_empty(&dpm_active) && error == 0) {
@@ -101,12 +116,10 @@ int device_suspend(pm_message_t state)
                /* Check if the device got removed */
                if (!list_empty(&dev->power.entry)) {
                        /* Move it to the dpm_off or dpm_off_irq list */
-                       if (!error) {
-                               list_del(&dev->power.entry);
-                               list_add(&dev->power.entry, &dpm_off);
-                       } else if (error == -EAGAIN) {
-                               list_del(&dev->power.entry);
-                               list_add(&dev->power.entry, &dpm_off_irq);
+                       if (!error)
+                               list_move(&dev->power.entry, &dpm_off);
+                       else if (error == -EAGAIN) {
+                               list_move(&dev->power.entry, &dpm_off_irq);
                                error = 0;
                        }
                }
@@ -124,8 +137,7 @@ int device_suspend(pm_message_t state)
                 */
                while (!list_empty(&dpm_off_irq)) {
                        struct list_head * entry = dpm_off_irq.next;
-                       list_del(entry);
-                       list_add(entry, &dpm_off);
+                       list_move(entry, &dpm_off);
                }
                dpm_resume();
        }
@@ -169,3 +181,12 @@ int device_power_down(pm_message_t state)
 
 EXPORT_SYMBOL_GPL(device_power_down);
 
+void __suspend_report_result(const char *function, void *fn, int ret)
+{
+       if (ret) {
+               printk(KERN_ERR "%s(): ", function);
+               print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+               printk("%d\n", ret);
+       }
+}
+EXPORT_SYMBOL_GPL(__suspend_report_result);