[PATCH] remove kernel/power/pm.c:pm_unregister()

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>

diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
index 1252b45face162d02b6d553429475786055503ab..008932d73c3564db945995b5cc1db52c8811c882 100644 (file)
--- a/include/linux/pm_legacy.h
+++ b/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/kernel/power/pm.c b/kernel/power/pm.c
index 0f6908cce1dd230ab4e0dfa423b2fae1e030f040..84063ac8fcfc95bd15d56dc6778ec45bb503aa43 100644 (file)
--- a/kernel/power/pm.c
+++ b/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);