aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-20 16:36:15 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-20 16:36:15 -0800
commit71678268cd21ccde999cbe107ed13432a66d695b (patch)
tree2bc9c33a0bde453275e47d0f2e891275fe1a001b
parente97d9d73001b59191d5f5019a7cc2e15079b5156 (diff)
downloadpatches-71678268cd21ccde999cbe107ed13432a66d695b.tar.gz
another driver core cleanup added
-rw-r--r--driver/driver-core-clean-up-shutdown.c.patch48
-rw-r--r--series1
2 files changed, 49 insertions, 0 deletions
diff --git a/driver/driver-core-clean-up-shutdown.c.patch b/driver/driver-core-clean-up-shutdown.c.patch
new file mode 100644
index 00000000000000..547183d0cd7ced
--- /dev/null
+++ b/driver/driver-core-clean-up-shutdown.c.patch
@@ -0,0 +1,48 @@
+From foo@baz Tue Apr 9 12:12:43 2002
+Date: Tue, 20 Nov 2007 13:56:21 -0800
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: driver core: clean up shutdown.c
+
+shutdown.c had some stuff it did not need, including a duplicate extern
+in the power.h file. This cleans up all of that.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/base/power/power.h | 7 -------
+ drivers/base/power/shutdown.c | 5 -----
+ 2 files changed, 12 deletions(-)
+
+--- a/drivers/base/power/power.h
++++ b/drivers/base/power/power.h
+@@ -1,10 +1,3 @@
+-/*
+- * shutdown.c
+- */
+-
+-extern void device_shutdown(void);
+-
+-
+ #ifdef CONFIG_PM_SLEEP
+
+ /*
+--- a/drivers/base/power/shutdown.c
++++ b/drivers/base/power/shutdown.c
+@@ -12,10 +12,6 @@
+ #include <asm/semaphore.h>
+
+ #include "../base.h"
+-#include "power.h"
+-
+-#define to_dev(node) container_of(node, struct device, kobj.entry)
+-
+
+ /**
+ * We handle system devices differently - we suspend and shut them
+@@ -45,4 +41,3 @@ void device_shutdown(void)
+ }
+ }
+ }
+-
diff --git a/series b/series
index f1095a2f1fe2c0..43c3ff0e85998c 100644
--- a/series
+++ b/series
@@ -93,6 +93,7 @@ driver/kobject-clean-up-rpadlpar-horrid-sysfs-abuse.patch
driver/kobject-convert-ecryptfs-to-use-kobject_create.patch
driver/kobject-convert-efivars-to-use-kobject_create.patch
driver/kobject-convert-parisc-pdc_stable-to-use-kobject_create.patch
+driver/driver-core-clean-up-shutdown.c.patch
# someday we will get these into mainline...
#driver/block-device.patch