Skip to content

Commit 0691663

Browse files
kaysieversgregkh
authored andcommitted
driver-core: add dev_name() to help transition away from using bus_id
Signed-off-by: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 886c35f commit 0691663

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

include/linux/device.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,12 @@ struct device {
380380
/* Get the wakeup routines, which depend on struct device */
381381
#include <linux/pm_wakeup.h>
382382

383+
static inline const char *dev_name(struct device *dev)
384+
{
385+
/* will be changed into kobject_name(&dev->kobj) in the near future */
386+
return dev->bus_id;
387+
}
388+
383389
#ifdef CONFIG_NUMA
384390
static inline int dev_to_node(struct device *dev)
385391
{
@@ -478,7 +484,7 @@ extern void sysdev_shutdown(void);
478484
extern const char *dev_driver_string(struct device *dev);
479485
#define dev_printk(level, dev, format, arg...) \
480486
printk(level "%s %s: " format , dev_driver_string(dev) , \
481-
(dev)->bus_id , ## arg)
487+
dev_name(dev) , ## arg)
482488

483489
#define dev_emerg(dev, format, arg...) \
484490
dev_printk(KERN_EMERG , dev , format , ## arg)

0 commit comments

Comments
 (0)