Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg Kroah-Hartman:
 "Here are two tiny patches, one fixing a dynamic debug problem that the
  printk rework turned up, and the other one fixing an extcon problem
  that people reported.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
  drivers-core: make structured logging play nice with dynamic-debug

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index f338037a4f3d..cdd01c52c629 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1865,6 +1865,7 @@ int __dev_printk(const char *level, const struct device *dev,
                  struct va_format *vaf)
 {
         char dict[128];
+        const char *level_extra = "";
         size_t dictlen = 0;
         const char *subsys;
 
@@ -1911,10 +1912,14 @@ int __dev_printk(const char *level, const struct device *dev,
                                     "DEVICE=+%s:%s", subsys, dev_name(dev));
         }
 skip:
+        if (level[3])
+                level_extra = &level[3]; /* skip past "<L>" */
+
         return printk_emit(0, level[1] - '0',
                            dictlen ? dict : NULL, dictlen,
-                           "%s %s: %pV",
-                           dev_driver_string(dev), dev_name(dev), vaf);
+                           "%s %s: %s%pV",
+                           dev_driver_string(dev), dev_name(dev),
+                           level_extra, vaf);
 }
 EXPORT_SYMBOL(__dev_printk);