VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index a2bc41c..86f9e6e 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -1,5 +1,5 @@
 /*
- * suspend.c - Functions for putting devices to sleep. 
+ * suspend.c - Functions for putting devices to sleep.
  *
  * Copyright (c) 2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Labs
@@ -10,18 +10,18 @@
 
 #include <linux/device.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 
- * are inserted at the back of the list on discovery. 
- * 
+ * because children are guaranteed to be discovered after parents, and
+ * are inserted at the back of the list on discovery.
+ *
  * All list on the suspend path are done in reverse order, so we operate
  * on the leaves of the device tree (or forests, depending on how you want
- * to look at it ;) first. As nodes are removed from the back of the list, 
- * they are inserted into the front of their destintation lists. 
+ * to look at it ;) first. As nodes are removed from the back of the list,
+ * they are inserted into the front of their destintation lists.
  *
  * Things are the reverse on the resume path - iterations are done in
  * forward order, and nodes are inserted at the back of their destination
@@ -44,7 +44,7 @@ int suspend_device(struct device * dev, u32 state)
        dev->power.prev_state = dev->power.power_state;
 
        if (dev->bus && dev->bus->suspend && !dev->power.power_state)
-               error = dev->bus->suspend(dev,state);
+               error = dev->bus->suspend(dev, state);
 
        return error;
 }
@@ -52,16 +52,16 @@ int suspend_device(struct device * dev, u32 state)
 
 /**
  *     device_suspend - Save state and stop all devices in system.
- *     @state:         Power state to put each device in. 
+ *     @state:         Power state to put each device in.
  *
  *     Walk the dpm_active list, call ->suspend() for each device, and move
- *     it to dpm_off. 
+ *     it to dpm_off.
  *     Check the return value for each. If it returns 0, then we move the
- *     the device to the dpm_off list. If it returns -EAGAIN, we move it to 
- *     the dpm_off_irq list. If we get a different error, try and back out. 
+ *     the device to the dpm_off list. If it returns -EAGAIN, we move it to
+ *     the dpm_off_irq list. If we get a different error, try and back out.
  *
  *     If we hit a failure with any of the devices, call device_resume()
- *     above to bring the suspended devices back to life. 
+ *     above to bring the suspended devices back to life.
  *
  *     Note this function leaves dpm_sem held to
  *     a) block other devices from registering.
@@ -78,14 +78,14 @@ int device_suspend(u32 state)
        while(!list_empty(&dpm_active)) {
                struct list_head * entry = dpm_active.prev;
                struct device * dev = to_device(entry);
-               error = suspend_device(dev,state);
+               error = suspend_device(dev, state);
 
                if (!error) {
                        list_del(&dev->power.entry);
-                       list_add(&dev->power.entry,&dpm_off);
+                       list_add(&dev->power.entry, &dpm_off);
                } else if (error == -EAGAIN) {
                        list_del(&dev->power.entry);
-                       list_add(&dev->power.entry,&dpm_off_irq);
+                       list_add(&dev->power.entry, &dpm_off_irq);
                } else {
                        printk(KERN_ERR "Could not suspend device %s: "
                                "error %d\n", kobject_name(&dev->kobj), error);
@@ -108,8 +108,8 @@ EXPORT_SYMBOL(device_suspend);
  *     @state:         Power state to enter.
  *
  *     Walk the dpm_off_irq list, calling ->power_down() for each device that
- *     couldn't power down the device with interrupts enabled. When we're 
- *     done, power down system devices. 
+ *     couldn't power down the device with interrupts enabled. When we're
+ *     done, power down system devices.
  */
 
 int device_power_down(u32 state)
@@ -117,10 +117,10 @@ int device_power_down(u32 state)
        int error = 0;
        struct device * dev;
 
-       list_for_each_entry_reverse(dev,&dpm_off_irq,power.entry) {
-               if ((error = suspend_device(dev,state)))
+       list_for_each_entry_reverse(dev, &dpm_off_irq, power.entry) {
+               if ((error = suspend_device(dev, state)))
                        break;
-       } 
+       }
        if (error)
                goto Error;
        if ((error = sysdev_suspend(state)))