diff options
| author | Joe Perches <joe@perches.com> | 2012-09-12 23:13:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 09:10:05 -0400 |
| commit | c2c5a7051c556036b7beb8f4a89eefdc91c3245b (patch) | |
| tree | 926e7b486447b29c0195111e4d5ce098d2138d4e | |
| parent | b004ff4972e2a42aa4512c90cc6a9e4dc1bb36b6 (diff) | |
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.c | 2 | ||||
| -rw-r--r-- | net/core/dev.c | 2 |
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, | |||
| 634 | dict, sizeof(dict)); | 634 | dict, sizeof(dict)); |
| 635 | 635 | ||
| 636 | res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen, | 636 | res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen, |
| 637 | "%s%s %s: %s: %pV", | 637 | "%s%s %s %s: %pV", |
| 638 | dynamic_emit_prefix(descriptor, buf), | 638 | dynamic_emit_prefix(descriptor, buf), |
| 639 | dev_driver_string(dev->dev.parent), | 639 | dev_driver_string(dev->dev.parent), |
| 640 | dev_name(dev->dev.parent), | 640 | 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, | |||
| 6435 | 6435 | ||
| 6436 | r = printk_emit(0, level[1] - '0', | 6436 | r = printk_emit(0, level[1] - '0', |
| 6437 | dictlen ? dict : NULL, dictlen, | 6437 | dictlen ? dict : NULL, dictlen, |
| 6438 | "%s %s: %s: %pV", | 6438 | "%s %s %s: %pV", |
| 6439 | dev_driver_string(dev->dev.parent), | 6439 | dev_driver_string(dev->dev.parent), |
| 6440 | dev_name(dev->dev.parent), | 6440 | dev_name(dev->dev.parent), |
| 6441 | netdev_name(dev), vaf); | 6441 | netdev_name(dev), vaf); |
