From 3d67e490a8feb38ccfab80f2bcfbc83794df407c Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 31 Mar 2006 01:38:12 -0800
Subject: [PATCH] --- yaml --- r: 25775 b: refs/heads/master c:
 78a596b4490e17b9990d87b9d468ef5bb70daa10 h: refs/heads/master i:   25773:
 7e11ec89ca8f8e334bd1fcca986304f5c00daafd   25771:
 308f9f17f95e3cf951767712f9c5b08f29901a8b   25767:
 264ddea382c2841f857e8f3848f544e1f6b025cc   25759:
 d50c085042294c83d28f5645ead88fd76b2c3a42 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/pm_legacy.h |  7 -------
 trunk/kernel/power/pm.c         | 20 --------------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 4df3979f24c7..cfb6eba86756 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21440d313358043b0ce5e43b00ff3c9b35a8616c
+refs/heads/master: 78a596b4490e17b9990d87b9d468ef5bb70daa10
diff --git a/trunk/include/linux/pm_legacy.h b/trunk/include/linux/pm_legacy.h
index 1252b45face1..008932d73c35 100644
--- a/trunk/include/linux/pm_legacy.h
+++ b/trunk/include/linux/pm_legacy.h
@@ -15,11 +15,6 @@ extern int pm_active;
 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
  */
@@ -41,8 +36,6 @@ static inline struct pm_dev *pm_register(pm_dev_t type,
 	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)
diff --git a/trunk/kernel/power/pm.c b/trunk/kernel/power/pm.c
index 0f6908cce1dd..84063ac8fcfc 100644
--- a/trunk/kernel/power/pm.c
+++ b/trunk/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 *data)
 }
 
 EXPORT_SYMBOL(pm_register);
-EXPORT_SYMBOL(pm_unregister);
 EXPORT_SYMBOL(pm_unregister_all);
 EXPORT_SYMBOL(pm_send_all);
 EXPORT_SYMBOL(pm_active);