Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
driver-core: add dev_name() to help transition away from using bus_id
+7
-1
+7
-1
include/linux/device.h
+7
-1
include/linux/device.h
···
380
380
/* Get the wakeup routines, which depend on struct device */
381
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
389
#ifdef CONFIG_NUMA
384
390
static inline int dev_to_node(struct device *dev)
385
391
{
···
484
478
extern const char *dev_driver_string(struct device *dev);
485
479
#define dev_printk(level, dev, format, arg...) \
486
480
printk(level "%s %s: " format , dev_driver_string(dev) , \
487
-
(dev)->bus_id , ## arg)
481
+
dev_name(dev) , ## arg)
488
482
489
483
#define dev_emerg(dev, format, arg...) \
490
484
dev_printk(KERN_EMERG , dev , format , ## arg)