1 files changed, 13 insertions, 17 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index b2e08c932d91..24f176c9fc9f 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -499,36 +499,32 @@ void get_usage_chars(struct lock_class *class, char usage[LOCK_USAGE_CHARS])
         usage[i] = '\0';
 }
 
-static int __print_lock_name(struct lock_class *class)
+static void __print_lock_name(struct lock_class *class)
 {
         char str[KSYM_NAME_LEN];
         const char *name;
 
         name = class->name;
-        if (!name)
-                name = __get_key_name(class->key, str);
-
-        return printk("%s", name);
-}
-
-static void print_lock_name(struct lock_class *class)
-{
-        char str[KSYM_NAME_LEN], usage[LOCK_USAGE_CHARS];
-        const char *name;
-
-        get_usage_chars(class, usage);
-
-        name = class->name;
         if (!name) {
                 name = __get_key_name(class->key, str);
-                printk(" (%s", name);
+                printk("%s", name);
         } else {
-                printk(" (%s", name);
+                printk("%s", name);
                 if (class->name_version > 1)
                         printk("#%d", class->name_version);
                 if (class->subclass)
                         printk("/%d", class->subclass);
         }
+}
+
+static void print_lock_name(struct lock_class *class)
+{
+        char usage[LOCK_USAGE_CHARS];
+
+        get_usage_chars(class, usage);
+
+        printk(" (");
+        __print_lock_name(class);
         printk("){%s}", usage);
 }