mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
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>
This commit is contained in:
parent
05e4e5b87a
commit
666f355f38
4 changed files with 21 additions and 40 deletions
|
@ -591,15 +591,11 @@ int __dynamic_dev_dbg(struct _ddebug *descriptor,
|
|||
res = printk(KERN_DEBUG "(NULL device *): %pV", &vaf);
|
||||
} else {
|
||||
char buf[PREFIX_SIZE];
|
||||
char dict[128];
|
||||
size_t dictlen;
|
||||
|
||||
dictlen = create_syslog_header(dev, dict, sizeof(dict));
|
||||
|
||||
res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,
|
||||
"%s%s %s: %pV",
|
||||
dynamic_emit_prefix(descriptor, buf),
|
||||
dev_driver_string(dev), dev_name(dev), &vaf);
|
||||
res = dev_printk_emit(7, dev, "%s%s %s: %pV",
|
||||
dynamic_emit_prefix(descriptor, buf),
|
||||
dev_driver_string(dev), dev_name(dev),
|
||||
&vaf);
|
||||
}
|
||||
|
||||
va_end(args);
|
||||
|
@ -627,18 +623,13 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,
|
|||
|
||||
if (dev && dev->dev.parent) {
|
||||
char buf[PREFIX_SIZE];
|
||||
char dict[128];
|
||||
size_t dictlen;
|
||||
|
||||
dictlen = create_syslog_header(dev->dev.parent,
|
||||
dict, sizeof(dict));
|
||||
|
||||
res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,
|
||||
"%s%s %s %s: %pV",
|
||||
dynamic_emit_prefix(descriptor, buf),
|
||||
dev_driver_string(dev->dev.parent),
|
||||
dev_name(dev->dev.parent),
|
||||
netdev_name(dev), &vaf);
|
||||
res = dev_printk_emit(7, dev->dev.parent,
|
||||
"%s%s %s %s: %pV",
|
||||
dynamic_emit_prefix(descriptor, buf),
|
||||
dev_driver_string(dev->dev.parent),
|
||||
dev_name(dev->dev.parent),
|
||||
netdev_name(dev), &vaf);
|
||||
} else if (dev) {
|
||||
res = printk(KERN_DEBUG "%s: %pV", netdev_name(dev), &vaf);
|
||||
} else {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue