diff options
author | Joe Perches <joe@perches.com> | 2012-09-12 23:14:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 09:10:05 -0400 |
commit | 666f355f3805d68b6ed5f7013806f1f65abfbf03 (patch) | |
tree | a04490ab9e68e4113410b7e7399edb9369545dfe /net/core/dev.c | |
parent | 05e4e5b87aab74f994acf9dd4bed4a8f1367cd09 (diff) |
device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit
Convert direct calls of vprintk_emit and printk_emit to the
dev_ equivalents.
Make create_syslog_header static.
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>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index cb9d43be07e7..76c0fe66fdc0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -6429,16 +6429,12 @@ static int __netdev_printk(const char *level, const struct net_device *dev, | |||
6429 | int r; | 6429 | int r; |
6430 | 6430 | ||
6431 | if (dev && dev->dev.parent) { | 6431 | if (dev && dev->dev.parent) { |
6432 | char dict[128]; | 6432 | r = dev_printk_emit(level[1] - '0', |
6433 | size_t dictlen = create_syslog_header(dev->dev.parent, | 6433 | dev->dev.parent, |
6434 | dict, sizeof(dict)); | 6434 | "%s %s %s: %pV", |
6435 | 6435 | dev_driver_string(dev->dev.parent), | |
6436 | r = printk_emit(0, level[1] - '0', | 6436 | dev_name(dev->dev.parent), |
6437 | dictlen ? dict : NULL, dictlen, | 6437 | netdev_name(dev), vaf); |
6438 | "%s %s %s: %pV", | ||
6439 | dev_driver_string(dev->dev.parent), | ||
6440 | dev_name(dev->dev.parent), | ||
6441 | netdev_name(dev), vaf); | ||
6442 | } else if (dev) { | 6438 | } else if (dev) { |
6443 | r = printk("%s%s: %pV", level, netdev_name(dev), vaf); | 6439 | r = printk("%s%s: %pV", level, netdev_name(dev), vaf); |
6444 | } else { | 6440 | } else { |