diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:02:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:02:53 -0700 |
| commit | 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8 (patch) | |
| tree | 96e6e5fbb15451ec281966706e2f6f3a5419fd61 /include/linux | |
| parent | 3482a6f1d1447b618d37049529cf36a8dc3bd3e3 (diff) | |
| parent | 06916639e2fed9ee475efef2747a1b7429f8fe76 (diff) | |
| download | linux-37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8.tar.gz linux-37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8.tar.bz2 linux-37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8.zip | |
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
Diffstat (limited to 'include/linux')
| -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 { /* 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) |