From 6cfa365a86e6e28b1f517c3997db948e6cecb0cf Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 26 Nov 2007 22:11:55 -0800
Subject: [PATCH] --- yaml --- r: 75791 b: refs/heads/master c:
 37b0c020343080241984d978981d6caf877b278a h: refs/heads/master i:   75789:
 e48627f0c21989451aea3ef3c7d65a44c1e7b1a4   75787:
 28260ac1e6146cc80cf7c4bcb4bb74c67516dd77   75783:
 9aa3c4b508b053eb06ef16e504de4158b73ba311   75775:
 83ddbd32c4004ae363f003b1507ba7d908a37498 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/base/core.c           | 20 +++++++++++++-
 trunk/drivers/base/power/Makefile   |  1 -
 trunk/drivers/base/power/shutdown.c | 43 -----------------------------
 4 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 trunk/drivers/base/power/shutdown.c

diff --git a/[refs] b/[refs]
index 729498bf5b06..276ec8872a8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 822a89ed1ea0f7a2d8079307426fbeeac0370138
+refs/heads/master: 37b0c020343080241984d978981d6caf877b278a
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index d2de2d59af42..b3a931fe6b16 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1415,5 +1415,23 @@ int device_move(struct device *dev, struct device *new_parent)
 	put_device(dev);
 	return error;
 }
-
 EXPORT_SYMBOL_GPL(device_move);
+
+/**
+ * device_shutdown - call ->shutdown() on each device to shutdown.
+ */
+void device_shutdown(void)
+{
+	struct device * dev, *devn;
+
+	list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
+				kobj.entry) {
+		if (dev->bus && dev->bus->shutdown) {
+			dev_dbg(dev, "shutdown\n");
+			dev->bus->shutdown(dev);
+		} else if (dev->driver && dev->driver->shutdown) {
+			dev_dbg(dev, "shutdown\n");
+			dev->driver->shutdown(dev);
+		}
+	}
+}
diff --git a/trunk/drivers/base/power/Makefile b/trunk/drivers/base/power/Makefile
index 44504e6618fb..06a86fe6a78d 100644
--- a/trunk/drivers/base/power/Makefile
+++ b/trunk/drivers/base/power/Makefile
@@ -1,4 +1,3 @@
-obj-y			:= shutdown.o
 obj-$(CONFIG_PM)	+= sysfs.o
 obj-$(CONFIG_PM_SLEEP)	+= main.o
 obj-$(CONFIG_PM_TRACE)	+= trace.o
diff --git a/trunk/drivers/base/power/shutdown.c b/trunk/drivers/base/power/shutdown.c
deleted file mode 100644
index 5b6bc168ffba..000000000000
--- a/trunk/drivers/base/power/shutdown.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * shutdown.c - power management functions for the device tree.
- *
- * Copyright (c) 2002-3 Patrick Mochel
- *		 2002-3 Open Source Development Lab
- *
- * This file is released under the GPLv2
- *
- */
-
-#include <linux/device.h>
-#include <asm/semaphore.h>
-
-#include "../base.h"
-
-/**
- * We handle system devices differently - we suspend and shut them
- * down last and resume them first. That way, we don't do anything stupid like
- * shutting down the interrupt controller before any devices..
- *
- * Note that there are not different stages for power management calls -
- * they only get one called once when interrupts are disabled.
- */
-
-
-/**
- * device_shutdown - call ->shutdown() on each device to shutdown.
- */
-void device_shutdown(void)
-{
-	struct device * dev, *devn;
-
-	list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
-				kobj.entry) {
-		if (dev->bus && dev->bus->shutdown) {
-			dev_dbg(dev, "shutdown\n");
-			dev->bus->shutdown(dev);
-		} else if (dev->driver && dev->driver->shutdown) {
-			dev_dbg(dev, "shutdown\n");
-			dev->driver->shutdown(dev);
-		}
-	}
-}