[PATCH] device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name

[PATCH] device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name

[Bjorn Helgaas]

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>
---
 include/linux/device.h |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/linux/device.h b/include/linux/device.h
index 2a9d6ed..7136a5c 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1149,16 +1149,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) \

Re: [PATCH] device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

On Thu, Oct 24, 2013 at 03:42:33PM -0600, Bjorn Helgaas wrote:
> 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>

Pretty cool, much nicer output indeed :-)

Reviewed-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]