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>

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index dff94c8fb35..abea76c36a4 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1865,7 +1865,8 @@ void device_shutdown(void)
  */
 
 #ifdef CONFIG_PRINTK
-int create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)
+static int
+create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)
 {
         const char *subsys;
         size_t pos = 0;
@@ -1943,17 +1944,12 @@ EXPORT_SYMBOL(dev_printk_emit);
 static int __dev_printk(const char *level, const struct device *dev,
                         struct va_format *vaf)
 {
-        char hdr[128];
-        size_t hdrlen;
-
         if (!dev)
                 return printk("%s(NULL device *): %pV", level, vaf);
 
-        hdrlen = create_syslog_header(dev, hdr, sizeof(hdr));
-
-        return printk_emit(0, level[1] - '0', hdrlen ? hdr : NULL, hdrlen,
-                           "%s %s: %pV",
-                           dev_driver_string(dev), dev_name(dev), vaf);
+        return dev_printk_emit(level[1] - '0', dev,
+                               "%s %s: %pV",
+                               dev_driver_string(dev), dev_name(dev), vaf);
 }
 
 int dev_printk(const char *level, const struct device *dev,