diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-30 16:45:50 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-30 16:45:50 -0700 |
commit | 4f380d9c1d1c3e77a996c2dfaa09daebdce6b257 (patch) | |
tree | b6786a0f524c5532299abc8359d5b8b3e66ff445 /driver | |
parent | 916bf118409d009d6100202823fe1d1e4ed35150 (diff) | |
download | patches-4f380d9c1d1c3e77a996c2dfaa09daebdce6b257.tar.gz |
more patches added
Diffstat (limited to 'driver')
-rw-r--r-- | driver/remove-kernel-power-pm.c-pm_unregister_all.patch | 98 | ||||
-rw-r--r-- | driver/the-scheduled-unexport-of-insert_resource.patch | 61 |
2 files changed, 159 insertions, 0 deletions
diff --git a/driver/remove-kernel-power-pm.c-pm_unregister_all.patch b/driver/remove-kernel-power-pm.c-pm_unregister_all.patch new file mode 100644 index 0000000000000..64b8649818272 --- /dev/null +++ b/driver/remove-kernel-power-pm.c-pm_unregister_all.patch @@ -0,0 +1,98 @@ +From akpm@osdl.org Fri Jun 30 16:30:11 2006 +From: Adrian Bunk <bunk@stusta.de> +Message-Id: <200606300915.k5U9FhhL001064@shell0.pdx.osdl.net> +Subject: remove kernel/power/pm.c:pm_unregister_all() +To: greg@kroah.com +Cc: akpm@osdl.org, bunk@stusta.de, pavel@suse.cz +Date: Fri, 30 Jun 2006 02:15:43 -0700 + +From: Adrian Bunk <bunk@stusta.de> + +Remove the deprecated and no longer used pm_unregister_all(). + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Acked-by: Pavel Machek <pavel@suse.cz> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/linux/pm_legacy.h | 7 ------- + kernel/power/pm.c | 37 ------------------------------------- + 2 files changed, 44 deletions(-) + +--- gregkh-2.6.orig/include/linux/pm_legacy.h ++++ gregkh-2.6/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; +--- gregkh-2.6.orig/kernel/power/pm.c ++++ gregkh-2.6/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); + diff --git a/driver/the-scheduled-unexport-of-insert_resource.patch b/driver/the-scheduled-unexport-of-insert_resource.patch new file mode 100644 index 0000000000000..b20d657d7daa8 --- /dev/null +++ b/driver/the-scheduled-unexport-of-insert_resource.patch @@ -0,0 +1,61 @@ +From akpm@osdl.org Fri Jun 30 16:30:44 2006 +From: Adrian Bunk <bunk@stusta.de> +Message-Id: <200606300915.k5U9Fgeu001057@shell0.pdx.osdl.net> +Subject: The scheduled unexport of insert_resource +To: greg@kroah.com +Cc: akpm@osdl.org, bunk@stusta.de +Date: Fri, 30 Jun 2006 02:15:42 -0700 + +From: Adrian Bunk <bunk@stusta.de> + +Implement the scheduled unexport of insert_resource. + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + Documentation/feature-removal-schedule.txt | 8 -------- + include/linux/ioport.h | 2 +- + kernel/resource.c | 2 -- + 3 files changed, 1 insertion(+), 11 deletions(-) + +--- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt ++++ gregkh-2.6/Documentation/feature-removal-schedule.txt +@@ -55,14 +55,6 @@ Who: Mauro Carvalho Chehab <mchehab@brtu + + --------------------------- + +-What: remove EXPORT_SYMBOL(insert_resource) +-When: April 2006 +-Files: kernel/resource.c +-Why: No modular usage in the kernel. +-Who: Adrian Bunk <bunk@stusta.de> +- +---------------------------- +- + What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) + When: November 2005 + Files: drivers/pcmcia/: pcmcia_ioctl.c +--- gregkh-2.6.orig/include/linux/ioport.h ++++ gregkh-2.6/include/linux/ioport.h +@@ -96,7 +96,7 @@ extern struct resource iomem_resource; + extern int request_resource(struct resource *root, struct resource *new); + extern struct resource * ____request_resource(struct resource *root, struct resource *new); + extern int release_resource(struct resource *new); +-extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new); ++extern int insert_resource(struct resource *parent, struct resource *new); + extern int allocate_resource(struct resource *root, struct resource *new, + resource_size_t size, resource_size_t min, + resource_size_t max, resource_size_t align, +--- gregkh-2.6.orig/kernel/resource.c ++++ gregkh-2.6/kernel/resource.c +@@ -405,8 +405,6 @@ int insert_resource(struct resource *par + return result; + } + +-EXPORT_SYMBOL(insert_resource); +- + /* + * Given an existing resource, change its start and size to match the + * arguments. Returns -EBUSY if it can't fit. Existing children of |