aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKay Sievers2008-05-02 06:02:41 +0200
committerGreg Kroah-Hartman2008-05-02 10:12:28 -0700
commit06916639e2fed9ee475efef2747a1b7429f8fe76 (patch)
treee3ae286fe04886b83808337c60ab19c5eb2f97c0 /include
parent886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a (diff)
driver-core: add dev_name() to help transition away from using bus_id
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/device.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 832fb0eb2933..8c23e3dfe3ac 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)