|
@@ -380,6 +380,12 @@ struct device {
|
|
/* Get the wakeup routines, which depend on struct device */
|
|
/* Get the wakeup routines, which depend on struct device */
|
|
#include <linux/pm_wakeup.h>
|
|
#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
|
|
#ifdef CONFIG_NUMA
|
|
static inline int dev_to_node(struct device *dev)
|
|
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);
|
|
extern const char *dev_driver_string(struct device *dev);
|
|
#define dev_printk(level, dev, format, arg...) \
|
|
#define dev_printk(level, dev, format, arg...) \
|
|
printk(level "%s %s: " format , dev_driver_string(dev) , \
|
|
printk(level "%s %s: " format , dev_driver_string(dev) , \
|
|
- (dev)->bus_id , ## arg)
|
|
|
|
|
|
+ dev_name(dev) , ## arg)
|
|
|
|
|
|
#define dev_emerg(dev, format, arg...) \
|
|
#define dev_emerg(dev, format, arg...) \
|
|
dev_printk(KERN_EMERG , dev , format , ## arg)
|
|
dev_printk(KERN_EMERG , dev , format , ## arg)
|