Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / drivers / base / power / shutdown.c

diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index 8826a5b6673eb9e4dfae4bb0d0b53126b77e4119..56e8eaaac012cd544f69df0823aef84b023cfaaf 100644 (file)
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/device.h>
 #include <asm/semaphore.h>
 
@@ -17,8 +16,6 @@
 
 #define to_dev(node) container_of(node, struct device, kobj.entry)
 
-extern struct subsystem devices_subsys;
-
 
 /**
  * We handle system devices differently - we suspend and shut them
@@ -37,8 +34,7 @@ void device_shutdown(void)
 {
        struct device * dev, *devn;
 
-       down_write(&devices_subsys.rwsem);
-       list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list,
+       list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list,
                                kobj.entry) {
                if (dev->bus && dev->bus->shutdown) {
                        dev_dbg(dev, "shutdown\n");
@@ -48,8 +44,5 @@ void device_shutdown(void)
                        dev->driver->shutdown(dev);
                }
        }
-       up_write(&devices_subsys.rwsem);
-
-       sysdev_shutdown();
 }