summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-09-12 20:13:01 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 06:10:05 -0700
commitc2c5a7051c556036b7beb8f4a89eefdc91c3245b (patch)
tree926e7b486447b29c0195111e4d5ce098d2138d4e
parentb004ff4972e2a42aa4512c90cc6a9e4dc1bb36b6 (diff)
downloadlinux-stable-c2c5a7051c556036b7beb8f4a89eefdc91c3245b.tar.gz
linux-stable-c2c5a7051c556036b7beb8f4a89eefdc91c3245b.tar.bz2
linux-stable-c2c5a7051c556036b7beb8f4a89eefdc91c3245b.zip
netdev_printk/netif_printk: Remove a superfluous logging colon
netdev_printk originally called dev_printk with %pV. This style emitted the complete dev_printk header with a colon followed by the netdev_name prefix followed by a colon. Now that netdev_printk does not call dev_printk, the extra colon is superfluous. Remove it. Example: old: sky2 0000:02:00.0: eth0: Link is up at 100 Mbps, full duplex, flow control both new: sky2 0000:02:00.0 eth0: Link is up at 100 Mbps, full duplex, flow control both Signed-off-by: Joe Perches <joe@perches.com> Acked-by: David S. Miller <davem@davemloft.net> Tested-by: Jim Cromie <jim.cromie@gmail.com> Acked-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--lib/dynamic_debug.c2
-rw-r--r--net/core/dev.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 2a29f4e04bdf..6b3ebabacfa8 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -634,7 +634,7 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,
dict, sizeof(dict));
res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,
- "%s%s %s: %s: %pV",
+ "%s%s %s %s: %pV",
dynamic_emit_prefix(descriptor, buf),
dev_driver_string(dev->dev.parent),
dev_name(dev->dev.parent),
diff --git a/net/core/dev.c b/net/core/dev.c
index ac890f14613a..cb9d43be07e7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6435,7 +6435,7 @@ static int __netdev_printk(const char *level, const struct net_device *dev,
r = printk_emit(0, level[1] - '0',
dictlen ? dict : NULL, dictlen,
- "%s %s: %s: %pV",
+ "%s %s %s: %pV",
dev_driver_string(dev->dev.parent),
dev_name(dev->dev.parent),
netdev_name(dev), vaf);