The patch titled remove kernel/power/pm.c:pm_unregister_all() has been added to the -mm tree. Its filename is remove-kernel-power-pmcpm_unregister_all.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: remove kernel/power/pm.c:pm_unregister_all() From: Adrian Bunk <bunk@xxxxxxxxx> Remove the deprecated and no longer used pm_unregister_all(). Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Pavel Machek <pavel@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/pm_legacy.h | 7 ------ kernel/power/pm.c | 37 ------------------------------------ 2 files changed, 44 deletions(-) diff -puN include/linux/pm_legacy.h~remove-kernel-power-pmcpm_unregister_all include/linux/pm_legacy.h --- a/include/linux/pm_legacy.h~remove-kernel-power-pmcpm_unregister_all +++ a/include/linux/pm_legacy.h @@ -15,11 +15,6 @@ struct pm_dev __deprecated * pm_register(pm_dev_t type, unsigned long id, pm_callback callback); /* - * Unregister all devices with matching callback - */ -void __deprecated pm_unregister_all(pm_callback callback); - -/* * Send a request to all devices */ int __deprecated pm_send_all(pm_request_t rqst, void *data); @@ -35,8 +30,6 @@ static inline struct pm_dev *pm_register return NULL; } -static inline void pm_unregister_all(pm_callback callback) {} - static inline int pm_send_all(pm_request_t rqst, void *data) { return 0; diff -puN kernel/power/pm.c~remove-kernel-power-pmcpm_unregister_all kernel/power/pm.c --- a/kernel/power/pm.c~remove-kernel-power-pmcpm_unregister_all +++ a/kernel/power/pm.c @@ -75,42 +75,6 @@ struct pm_dev *pm_register(pm_dev_t type return dev; } -static void __pm_unregister(struct pm_dev *dev) -{ - if (dev) { - list_del(&dev->entry); - kfree(dev); - } -} - -/** - * pm_unregister_all - unregister all devices with matching callback - * @callback: callback function pointer - * - * Unregister every device that would call the callback passed. This - * is primarily meant as a helper function for loadable modules. It - * enables a module to give up all its managed devices without keeping - * its own private list. - */ - -void pm_unregister_all(pm_callback callback) -{ - struct list_head *entry; - - if (!callback) - return; - - mutex_lock(&pm_devs_lock); - entry = pm_devs.next; - while (entry != &pm_devs) { - struct pm_dev *dev = list_entry(entry, struct pm_dev, entry); - entry = entry->next; - if (dev->callback == callback) - __pm_unregister(dev); - } - mutex_unlock(&pm_devs_lock); -} - /** * pm_send - send request to a single device * @dev: device to send to @@ -239,7 +203,6 @@ int pm_send_all(pm_request_t rqst, void } EXPORT_SYMBOL(pm_register); -EXPORT_SYMBOL(pm_unregister_all); EXPORT_SYMBOL(pm_send_all); EXPORT_SYMBOL(pm_active); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-acpi.patch drivers-acpi-scanc-make-acpi_bus_type-static.patch git-agpgart.patch the-scheduled-unexport-of-insert_resource.patch remove-kernel-power-pmcpm_unregister_all.patch git-gfs2.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch fs-jffs2-make-2-functions-static.patch ni5010-netcard-cleanup-fix.patch drivers-dma-iovlockc-make-num_pages_spanned-static.patch drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch fix-the-au1000_fir-dependencies.patch git-ocfs2.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-qla2xxx-make-more-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-arcmsr-cleanups.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch acx1xx-wireless-driver.patch fix-the-init_env_arg_limit-dependencies.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-implement-clone_newuts-flag-tidy.patch task-watchers-register-semundo-task-watcher-cleanup.patch fs-reiser4-possible-cleanups.patch drivers-ide-legacy-ide-csc-make-2-functions-static.patch lockdep-core.patch srcu-add-srcu-operations-to-rcutorture-tidy-2.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html