summaryrefslogtreecommitdiff
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-10-25 01:42:33 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-30 03:06:07 +0400
commit3eae13671716492f3bcde270115407185e9c69fd (patch)
tree80fb3ba611ad5f0b1a53f23e5d36ed3f6f59bcd0 /include/linux/device.h
parentd1c1459e45944e336a968acce1e459c9effcde47 (diff)
downloadlinux-3eae13671716492f3bcde270115407185e9c69fd.tar.xz
device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name
dev_WARN() and dev_WARN_ONCE() are annoying because (1) they include only the driver name, not the device name, and (2) they print a spurious newline in the middle. This results in messages like this that are less useful than they should be: [ 40.094995] Device pcieport disabling already-disabled device This patch makes them work more like dev_printk(). Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 5e44cff5bced..b025925df7f7 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1170,16 +1170,15 @@ do { \
#endif
/*
- * dev_WARN*() acts like dev_printk(), but with the key difference
- * of using a WARN/WARN_ON to get the message out, including the
- * file/line information and a backtrace.
+ * dev_WARN*() acts like dev_printk(), but with the key difference of
+ * using WARN/WARN_ONCE to include file/line information and a backtrace.
*/
#define dev_WARN(dev, format, arg...) \
- WARN(1, "Device: %s\n" format, dev_driver_string(dev), ## arg);
+ WARN(1, "%s %s: " format, dev_driver_string(dev), dev_name(dev), ## arg);
#define dev_WARN_ONCE(dev, condition, format, arg...) \
- WARN_ONCE(condition, "Device %s\n" format, \
- dev_driver_string(dev), ## arg)
+ WARN_ONCE(condition, "%s %s: " format, \
+ dev_driver_string(dev), dev_name(dev), ## arg)
/* Create alias, so I can be autoloaded. */
#define MODULE_ALIAS_CHARDEV(major,minor) \