diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-01-07 05:29:37 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-01-07 05:29:37 -0800 |
| commit | 19e374c1b1f808086840d97ef9df44d106b4181a (patch) | |
| tree | 26cd6a38dfaa990e28f64495995fda796daa0cce /include/linux/device.h | |
| parent | 060c05b977c306bad1f787963a193ad1b65d6aa0 (diff) | |
| parent | 9932a78d25315783159bb3b2541481ec3d244eba (diff) | |
Merge kroah.com:/home/linux/linux/BK/bleeding-2.5
into kroah.com:/home/linux/linux/BK/gregkh-2.5
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 2076d9c6ae4b..d5aa116942b8 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -400,21 +400,21 @@ extern int firmware_register(struct subsystem *); extern void firmware_unregister(struct subsystem *); /* debugging and troubleshooting/diagnostic helpers. */ -#define dev_printk(sev, dev, format, arg...) \ - printk(sev "%s %s: " format , (dev).driver->name , (dev).bus_id , ## arg) +#define dev_printk(level, dev, format, arg...) \ + printk(level "%s %s: " format , (dev)->driver->name , (dev)->bus_id , ## arg) #ifdef DEBUG #define dev_dbg(dev, format, arg...) \ - dev_printk(KERN_DEBUG , (dev) , format , ## arg) + dev_printk(KERN_DEBUG , dev , format , ## arg) #else #define dev_dbg(dev, format, arg...) do {} while (0) #endif #define dev_err(dev, format, arg...) \ - dev_printk(KERN_ERR , (dev) , format , ## arg) + dev_printk(KERN_ERR , dev , format , ## arg) #define dev_info(dev, format, arg...) \ - dev_printk(KERN_INFO , (dev) , format , ## arg) + dev_printk(KERN_INFO , dev , format , ## arg) #define dev_warn(dev, format, arg...) \ - dev_printk(KERN_WARNING , (dev) , format , ## arg) + dev_printk(KERN_WARNING , dev , format , ## arg) #endif /* _DEVICE_H_ */ |