diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-15 09:57:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-15 09:57:56 -0700 |
| commit | de2bbd73d3158217114840b9c31e58c328f0d32d (patch) | |
| tree | 7377ef5c4a0bbb756b3c1f1572e7edce547952a4 /driver | |
| parent | 79054bca4f34ac6630d91a2282b1b3bc500eb963 (diff) | |
| download | patches-de2bbd73d3158217114840b9c31e58c328f0d32d.tar.gz | |
add driver printk patch and reorder a few others
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/dev_printk_add_bus.patch | 29 | ||||
| -rw-r--r-- | driver/device-class.patch | 4 | ||||
| -rw-r--r-- | driver/put_device-might_sleep.patch | 2 |
3 files changed, 32 insertions, 3 deletions
diff --git a/driver/dev_printk_add_bus.patch b/driver/dev_printk_add_bus.patch new file mode 100644 index 0000000000000..6879f88a73ad2 --- /dev/null +++ b/driver/dev_printk_add_bus.patch @@ -0,0 +1,29 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Thu, 15 Jun 2006 08:44:32 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: Driver core: make dev_printk() print the bus name if no driver is bound + +This should make the output a bit more readable when devices have not +been bound to a driver yet. + +Cc: Alan Stern <stern@rowland.harvard.edu> +Cc: Matthew Wilcox <matthew@wil.cx> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/linux/device.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- gregkh-2.6.orig/include/linux/device.h ++++ gregkh-2.6/include/linux/device.h +@@ -418,7 +418,8 @@ extern void firmware_unregister(struct s + + /* debugging and troubleshooting/diagnostic helpers. */ + #define dev_printk(level, dev, format, arg...) \ +- printk(level "%s %s: " format , (dev)->driver ? (dev)->driver->name : "" , (dev)->bus_id , ## arg) ++ printk(level "%s %s: " format , (dev)->driver ? (dev)->driver->name : \ ++ (dev)->bus ? (dev)->bus->name : "" , (dev)->bus_id , ## arg) + + #ifdef DEBUG + #define dev_dbg(dev, format, arg...) \ diff --git a/driver/device-class.patch b/driver/device-class.patch index 65ef6b53a95b7..40dc880393df3 100644 --- a/driver/device-class.patch +++ b/driver/device-class.patch @@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kobject_uevent(&dev->kobj, KOBJ_REMOVE); kobject_del(&dev->kobj); Error: -@@ -367,6 +424,10 @@ void device_del(struct device * dev) +@@ -366,6 +423,10 @@ void device_del(struct device * dev) if (parent) klist_del(&dev->knode_parent); @@ -156,7 +156,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> device_remove_file(dev, &dev->uevent_attr); /* Notify the platform of the removal, in case they -@@ -451,3 +512,107 @@ EXPORT_SYMBOL_GPL(put_device); +@@ -450,3 +511,107 @@ EXPORT_SYMBOL_GPL(put_device); EXPORT_SYMBOL_GPL(device_create_file); EXPORT_SYMBOL_GPL(device_remove_file); diff --git a/driver/put_device-might_sleep.patch b/driver/put_device-might_sleep.patch index fcc3b60d99d1f..3c66e348c65b5 100644 --- a/driver/put_device-might_sleep.patch +++ b/driver/put_device-might_sleep.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/base/core.c +++ gregkh-2.6/drivers/base/core.c -@@ -341,6 +341,7 @@ struct device * get_device(struct device +@@ -398,6 +398,7 @@ struct device * get_device(struct device */ void put_device(struct device * dev) { |