diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | 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 832fb0eb2933..8c23e3dfe3ac 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -380,6 +380,12 @@ struct device { | |||
380 | /* Get the wakeup routines, which depend on struct device */ | 380 | /* Get the wakeup routines, which depend on struct device */ |
381 | #include <linux/pm_wakeup.h> | 381 | #include <linux/pm_wakeup.h> |
382 | 382 | ||
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 | |||
383 | #ifdef CONFIG_NUMA | 389 | #ifdef CONFIG_NUMA |
384 | static inline int dev_to_node(struct device *dev) | 390 | static inline int dev_to_node(struct device *dev) |
385 | { | 391 | { |
@@ -478,7 +484,7 @@ extern void sysdev_shutdown(void); | |||
478 | extern const char *dev_driver_string(struct device *dev); | 484 | extern const char *dev_driver_string(struct device *dev); |
479 | #define dev_printk(level, dev, format, arg...) \ | 485 | #define dev_printk(level, dev, format, arg...) \ |
480 | printk(level "%s %s: " format , dev_driver_string(dev) , \ | 486 | printk(level "%s %s: " format , dev_driver_string(dev) , \ |
481 | (dev)->bus_id , ## arg) | 487 | dev_name(dev) , ## arg) |
482 | 488 | ||
483 | #define dev_emerg(dev, format, arg...) \ | 489 | #define dev_emerg(dev, format, arg...) \ |
484 | dev_printk(KERN_EMERG , dev , format , ## arg) | 490 | dev_printk(KERN_EMERG , dev , format , ## arg) |