4 files changed, 22 insertions, 41 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index dff94c8fb350..abea76c36a4b 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,
diff --git a/include/linux/device.h b/include/linux/device.h
index 0d9ba0c09791..6d37e59db571 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -895,8 +895,6 @@ extern const char *dev_driver_string(const struct device *dev);
 
 #ifdef CONFIG_PRINTK
 
-extern int create_syslog_header(const struct device *dev,
-                                char *hdr, size_t hdrlen);
 extern int dev_vprintk_emit(int level, const struct device *dev,
                             const char *fmt, va_list args);
 extern __printf(3, 4)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 6b3ebabacfa8..e7f7d993357a 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -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 {
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,
         int r;
 
         if (dev && dev->dev.parent) {
-                char dict[128];
-                size_t dictlen = create_syslog_header(dev->dev.parent,
-                                                      dict, sizeof(dict));
-
-                r = printk_emit(0, level[1] - '0',
-                                dictlen ? dict : NULL, dictlen,
-                                "%s %s %s: %pV",
-                                dev_driver_string(dev->dev.parent),
-                                dev_name(dev->dev.parent),
-                                netdev_name(dev), vaf);
+                r = dev_printk_emit(level[1] - '0',
+                                    dev->dev.parent,
+                                    "%s %s %s: %pV",
+                                    dev_driver_string(dev->dev.parent),
+                                    dev_name(dev->dev.parent),
+                                    netdev_name(dev), vaf);
         } else if (dev) {
                 r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
         } else {