[GIT PATCH] driver core patch against 2.6.25-git

[GIT PATCH] driver core patch against 2.6.25-git

[Greg KH]

Here is one patch against your 2.6.25-git tree.

It provides a new function, dev_name() to help with the transition away
from using the bus_id field in struct device.  The full transision will
happen over the next few kernel releases.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/

The patch will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 include/linux/device.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

---------------

Kay Sievers (1):
      driver-core: add dev_name() to help transition away from using bus_id

[PATCH 1/1] driver-core: add dev_name() to help transition away from using bus_id

[Greg Kroah-Hartman]

From: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 include/linux/device.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/include/linux/device.h b/include/linux/device.h
index 832fb0e..8c23e3d 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -380,6 +380,12 @@ struct device {
 /* Get the wakeup routines, which depend on struct device */
 #include <linux/pm_wakeup.h>
 
+static inline const char *dev_name(struct device *dev)
+{
+	/* will be changed into kobject_name(&dev->kobj) in the near future */
+	return dev->bus_id;
+}
+
 #ifdef CONFIG_NUMA
 static inline int dev_to_node(struct device *dev)
 {
@@ -478,7 +484,7 @@ extern void sysdev_shutdown(void);
 extern const char *dev_driver_string(struct device *dev);
 #define dev_printk(level, dev, format, arg...)	\
 	printk(level "%s %s: " format , dev_driver_string(dev) , \
-	       (dev)->bus_id , ## arg)
+	       dev_name(dev) , ## arg)
 
 #define dev_emerg(dev, format, arg...)		\
 	dev_printk(KERN_EMERG , dev , format , ## arg)
-- 
1.5.5.1