Merge branch 'master' into upstream

[~andy/linux] / drivers / base / power / resume.c

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 0a7aa07b9a2a600cc9b52992b8e0f0d44216af17..020be36705a6827f38bfa15c83a304672b9e9c55 100644 (file)
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,10 +9,10 @@
  */
 
 #include <linux/device.h>
+#include <linux/resume-trace.h>
+#include "../base.h"
 #include "power.h"
 
-extern int sysdev_resume(void);
-
 
 /**
  *     resume_device - Restore state for one device.
@@ -24,6 +24,8 @@ int resume_device(struct device * dev)
 {
        int error = 0;
 
+       TRACE_DEVICE(dev);
+       TRACE_RESUME(0);
        down(&dev->sem);
        if (dev->power.pm_parent
                        && dev->power.pm_parent->power.power_state.event) {
@@ -36,12 +38,35 @@ int resume_device(struct device * dev)
                dev_dbg(dev,"resuming\n");
                error = dev->bus->resume(dev);
        }
+       if (dev->class && dev->class->resume) {
+               dev_dbg(dev,"class resume\n");
+               error = dev->class->resume(dev);
+       }
        up(&dev->sem);
+       TRACE_RESUME(error);
        return error;
 }
 
 
+static int resume_device_early(struct device * dev)
+{
+       int error = 0;
+
+       TRACE_DEVICE(dev);
+       TRACE_RESUME(0);
+       if (dev->bus && dev->bus->resume_early) {
+               dev_dbg(dev,"EARLY resume\n");
+               error = dev->bus->resume_early(dev);
+       }
+       TRACE_RESUME(error);
+       return error;
+}
 
+/*
+ * Resume the devices that have either not gone through
+ * the late suspend, or that did go through it but also
+ * went through the early resume
+ */
 void dpm_resume(void)
 {
        down(&dpm_list_sem);
@@ -50,8 +75,7 @@ void dpm_resume(void)
                struct device * dev = to_device(entry);
 
                get_device(dev);
-               list_del_init(entry);
-               list_add_tail(entry, &dpm_active);
+               list_move_tail(entry, &dpm_active);
 
                up(&dpm_list_sem);
                if (!dev->power.prev_state.event)
@@ -72,6 +96,7 @@ void dpm_resume(void)
 
 void device_resume(void)
 {
+       might_sleep();
        down(&dpm_sem);
        dpm_resume();
        up(&dpm_sem);
@@ -81,12 +106,12 @@ EXPORT_SYMBOL_GPL(device_resume);
 
 
 /**
- *     device_power_up_irq - Power on some devices.
+ *     dpm_power_up - Power on some devices.
  *
  *     Walk the dpm_off_irq list and power each device up. This
  *     is used for devices that required they be powered down with
- *     interrupts disabled. As devices are powered on, they are moved to
- *     the dpm_suspended list.
+ *     interrupts disabled. As devices are powered on, they are moved
+ *     to the dpm_active list.
  *
  *     Interrupts must be disabled when calling this.
  */
@@ -97,17 +122,14 @@ void dpm_power_up(void)
                struct list_head * entry = dpm_off_irq.next;
                struct device * dev = to_device(entry);
 
-               get_device(dev);
-               list_del_init(entry);
-               list_add_tail(entry, &dpm_active);
-               resume_device(dev);
-               put_device(dev);
+               list_move_tail(entry, &dpm_off);
+               resume_device_early(dev);
        }
 }
 
 
 /**
- *     device_pm_power_up - Turn on all devices that need special attention.
+ *     device_power_up - Turn on all devices that need special attention.
  *
  *     Power on system devices then devices that required we shut them down
  *     with interrupts disabled.