Skip to content

Commit

Permalink
driver-core: add dev_name() to help transition away from using bus_id
Browse files Browse the repository at this point in the history
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kay Sievers authored and Greg Kroah-Hartman committed May 2, 2008
1 parent 886c35f commit 0691663
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion include/linux/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 0691663

Please sign in to comment.