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>

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 2a29f4e04bdf298c6ccf2bddb2d2ef6be67273e2..6b3ebabacfa850daecf01a28ad1167f6252ad154 100644 (file)
--- 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 ac890f14613a855953bcc4edbb45a120cfd68670..cb9d43be07e7ee7e998c743cbf37ad9200b14c32 100644 (file)
--- 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);