Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / drivers / base / power / shutdown.c

diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index 3483ae4d57f59a09025d8d0c49d2100ea72c81ee..a47ee1b70d2086b76bf41852650dc236fc483e38 100644 (file)
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -16,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
@@ -36,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");
@@ -47,7 +44,6 @@ void device_shutdown(void)
                        dev->driver->shutdown(dev);
                }
        }
-       up_write(&devices_subsys.rwsem);
 
        sysdev_shutdown();
 }