diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-03-31 04:38:12 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-14 15:25:26 -0400 |
| commit | 78a596b4490e17b9990d87b9d468ef5bb70daa10 (patch) | |
| tree | be8f14e15adfae7215ed7c8ad7f995d078ed55c9 | |
| parent | 21440d313358043b0ce5e43b00ff3c9b35a8616c (diff) | |
[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>
| -rw-r--r-- | include/linux/pm_legacy.h | 7 | ||||
| -rw-r--r-- | kernel/power/pm.c | 20 |
2 files changed, 0 insertions, 27 deletions
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h index 1252b45face1..008932d73c35 100644 --- a/include/linux/pm_legacy.h +++ b/include/linux/pm_legacy.h | |||
| @@ -16,11 +16,6 @@ struct pm_dev __deprecated * | |||
| 16 | pm_register(pm_dev_t type, unsigned long id, pm_callback callback); | 16 | pm_register(pm_dev_t type, unsigned long id, pm_callback callback); |
| 17 | 17 | ||
| 18 | /* | 18 | /* |
| 19 | * Unregister a device with power management | ||
| 20 | */ | ||
| 21 | void __deprecated pm_unregister(struct pm_dev *dev); | ||
| 22 | |||
| 23 | /* | ||
| 24 | * Unregister all devices with matching callback | 19 | * Unregister all devices with matching callback |
| 25 | */ | 20 | */ |
| 26 | void __deprecated pm_unregister_all(pm_callback callback); | 21 | void __deprecated pm_unregister_all(pm_callback callback); |
| @@ -41,8 +36,6 @@ static inline struct pm_dev *pm_register(pm_dev_t type, | |||
| 41 | return NULL; | 36 | return NULL; |
| 42 | } | 37 | } |
| 43 | 38 | ||
| 44 | static inline void pm_unregister(struct pm_dev *dev) {} | ||
| 45 | |||
| 46 | static inline void pm_unregister_all(pm_callback callback) {} | 39 | static inline void pm_unregister_all(pm_callback callback) {} |
| 47 | 40 | ||
| 48 | static inline int pm_send_all(pm_request_t rqst, void *data) | 41 | 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 0f6908cce1dd..84063ac8fcfc 100644 --- a/kernel/power/pm.c +++ b/kernel/power/pm.c | |||
| @@ -75,25 +75,6 @@ struct pm_dev *pm_register(pm_dev_t type, | |||
| 75 | return dev; | 75 | return dev; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | /** | ||
| 79 | * pm_unregister - unregister a device with power management | ||
| 80 | * @dev: device to unregister | ||
| 81 | * | ||
| 82 | * Remove a device from the power management notification lists. The | ||
| 83 | * dev passed must be a handle previously returned by pm_register. | ||
| 84 | */ | ||
| 85 | |||
| 86 | void pm_unregister(struct pm_dev *dev) | ||
| 87 | { | ||
| 88 | if (dev) { | ||
| 89 | mutex_lock(&pm_devs_lock); | ||
| 90 | list_del(&dev->entry); | ||
| 91 | mutex_unlock(&pm_devs_lock); | ||
| 92 | |||
| 93 | kfree(dev); | ||
| 94 | } | ||
| 95 | } | ||
| 96 | |||
| 97 | static void __pm_unregister(struct pm_dev *dev) | 78 | static void __pm_unregister(struct pm_dev *dev) |
| 98 | { | 79 | { |
| 99 | if (dev) { | 80 | if (dev) { |
| @@ -258,7 +239,6 @@ int pm_send_all(pm_request_t rqst, void *data) | |||
| 258 | } | 239 | } |
| 259 | 240 | ||
| 260 | EXPORT_SYMBOL(pm_register); | 241 | EXPORT_SYMBOL(pm_register); |
| 261 | EXPORT_SYMBOL(pm_unregister); | ||
| 262 | EXPORT_SYMBOL(pm_unregister_all); | 242 | EXPORT_SYMBOL(pm_unregister_all); |
| 263 | EXPORT_SYMBOL(pm_send_all); | 243 | EXPORT_SYMBOL(pm_send_all); |
| 264 | EXPORT_SYMBOL(pm_active); | 244 | EXPORT_SYMBOL(pm_active); |
