From kay.sievers@vrfy.org Fri May 2 09:28:43 2008 From: Kay Sievers Date: Fri, 02 May 2008 06:02:41 +0200 Subject: driver-core: add dev_name() to help transition away from using bus_id Message-ID: <1209700961.3100.6.camel@linux.site> Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- include/linux/device.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/include/linux/device.h +++ b/include/linux/device.h @@ -387,6 +387,12 @@ struct device { /* Get the wakeup routines, which depend on struct device */ #include +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) { @@ -485,7 +491,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)