aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-04-06 10:08:19 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-04-06 10:08:19 -0700
commitce40196200ca234d1abe8dd66a96906745501a05 (patch)
tree700e1c99e298d8636b2b97f68276681db577e719 /pci
parent788a651935432b61fd0d03707d0d679de678b9c1 (diff)
downloadpatches-ce40196200ca234d1abe8dd66a96906745501a05.tar.gz
more patches added
Diffstat (limited to 'pci')
-rw-r--r--pci/remove-kernel-power-pm.c-pm_unregister.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/pci/remove-kernel-power-pm.c-pm_unregister.patch b/pci/remove-kernel-power-pm.c-pm_unregister.patch
new file mode 100644
index 0000000000000..1f13dc82dd027
--- /dev/null
+++ b/pci/remove-kernel-power-pm.c-pm_unregister.patch
@@ -0,0 +1,83 @@
+From akpm@osdl.org Fri Mar 31 01:38:43 2006
+Message-Id: <200603310938.k2V9cYKP014993@shell0.pdx.osdl.net>
+Subject: [patch 1/1] remove kernel/power/pm.c:pm_unregister()
+To: greg@kroah.com
+Cc: akpm@osdl.org, bunk@stusta.de, pavel@ucw.cz
+From: akpm@osdl.org
+Date: Fri, 31 Mar 2006 01:38:12 -0800
+
+
+From: Adrian Bunk <bunk@stusta.de>
+
+Since the last user is removed in -mm, we can now remove this long deprecated
+function.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Cc: Pavel Machek <pavel@ucw.cz>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/pm_legacy.h | 7 -------
+ kernel/power/pm.c | 20 --------------------
+ 2 files changed, 27 deletions(-)
+
+--- gregkh-2.6.orig/include/linux/pm_legacy.h
++++ gregkh-2.6/include/linux/pm_legacy.h
+@@ -16,11 +16,6 @@ struct pm_dev __deprecated *
+ pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
+
+ /*
+- * Unregister a device with power management
+- */
+-void __deprecated pm_unregister(struct pm_dev *dev);
+-
+-/*
+ * Unregister all devices with matching callback
+ */
+ void __deprecated pm_unregister_all(pm_callback callback);
+@@ -41,8 +36,6 @@ static inline struct pm_dev *pm_register
+ return NULL;
+ }
+
+-static inline void pm_unregister(struct pm_dev *dev) {}
+-
+ static inline void pm_unregister_all(pm_callback callback) {}
+
+ static inline int pm_send_all(pm_request_t rqst, void *data)
+--- gregkh-2.6.orig/kernel/power/pm.c
++++ gregkh-2.6/kernel/power/pm.c
+@@ -75,25 +75,6 @@ struct pm_dev *pm_register(pm_dev_t type
+ return dev;
+ }
+
+-/**
+- * pm_unregister - unregister a device with power management
+- * @dev: device to unregister
+- *
+- * Remove a device from the power management notification lists. The
+- * dev passed must be a handle previously returned by pm_register.
+- */
+-
+-void pm_unregister(struct pm_dev *dev)
+-{
+- if (dev) {
+- mutex_lock(&pm_devs_lock);
+- list_del(&dev->entry);
+- mutex_unlock(&pm_devs_lock);
+-
+- kfree(dev);
+- }
+-}
+-
+ static void __pm_unregister(struct pm_dev *dev)
+ {
+ if (dev) {
+@@ -258,7 +239,6 @@ int pm_send_all(pm_request_t rqst, void
+ }
+
+ EXPORT_SYMBOL(pm_register);
+-EXPORT_SYMBOL(pm_unregister);
+ EXPORT_SYMBOL(pm_unregister_all);
+ EXPORT_SYMBOL(pm_send_all);
+ EXPORT_SYMBOL(pm_active);