From: Adrian Bunk Since the last user is removed in -mm, we can now remove this long deprecated function. Signed-off-by: Adrian Bunk Cc: Greg KH Cc: Pavel Machek Signed-off-by: Andrew Morton --- include/linux/pm_legacy.h | 7 ------- kernel/power/pm.c | 20 -------------------- 2 files changed, 27 deletions(-) diff -puN include/linux/pm_legacy.h~remove-kernel-power-pmcpm_unregister include/linux/pm_legacy.h --- devel/include/linux/pm_legacy.h~remove-kernel-power-pmcpm_unregister 2006-03-23 03:13:01.000000000 -0800 +++ devel-akpm/include/linux/pm_legacy.h 2006-03-23 03:13:01.000000000 -0800 @@ -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) diff -puN kernel/power/pm.c~remove-kernel-power-pmcpm_unregister kernel/power/pm.c --- devel/kernel/power/pm.c~remove-kernel-power-pmcpm_unregister 2006-03-23 03:13:01.000000000 -0800 +++ devel-akpm/kernel/power/pm.c 2006-03-23 03:13:37.000000000 -0800 @@ -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); _