Merge tag 'trace-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[linux-block.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index 6e2f0bee356042c8fd485e4992873d3f9069f8d8..f79a434e12316608fb5dd32a1197b0d85c584740 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -10,6 +10,8 @@
  * about using the kobject interface.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kobject.h>
 #include <linux/string.h>
 #include <linux/export.h>
@@ -127,7 +129,7 @@ static int fill_kobj_path(const struct kobject *kobj, char *path, int length)
                *(path + --length) = '/';
        }
 
-       pr_debug("kobject: '%s' (%p): %s: path = '%s'\n", kobject_name(kobj),
+       pr_debug("'%s' (%p): %s: path = '%s'\n", kobject_name(kobj),
                 kobj, __func__, path);
 
        return 0;
@@ -223,7 +225,7 @@ static int kobject_add_internal(struct kobject *kobj)
                kobj->parent = parent;
        }
 
-       pr_debug("kobject: '%s' (%p): %s: parent: '%s', set: '%s'\n",
+       pr_debug("'%s' (%p): %s: parent: '%s', set: '%s'\n",
                 kobject_name(kobj), kobj, __func__,
                 parent ? kobject_name(parent) : "<NULL>",
                 kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>");
@@ -338,7 +340,7 @@ void kobject_init(struct kobject *kobj, const struct kobj_type *ktype)
                /* do not error out as sometimes we can recover */
                pr_err("kobject (%p): tried to init an initialized object, something is seriously wrong.\n",
                       kobj);
-               dump_stack();
+               dump_stack_lvl(KERN_ERR);
        }
 
        kobject_init_internal(kobj);
@@ -347,7 +349,7 @@ void kobject_init(struct kobject *kobj, const struct kobj_type *ktype)
 
 error:
        pr_err("kobject (%p): %s\n", kobj, err_str);
-       dump_stack();
+       dump_stack_lvl(KERN_ERR);
 }
 EXPORT_SYMBOL(kobject_init);
 
@@ -359,7 +361,7 @@ static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
 
        retval = kobject_set_name_vargs(kobj, fmt, vargs);
        if (retval) {
-               pr_err("kobject: can not set name properly!\n");
+               pr_err("can not set name properly!\n");
                return retval;
        }
        kobj->parent = parent;
@@ -411,7 +413,7 @@ int kobject_add(struct kobject *kobj, struct kobject *parent,
        if (!kobj->state_initialized) {
                pr_err("kobject '%s' (%p): tried to add an uninitialized object, something is seriously wrong.\n",
                       kobject_name(kobj), kobj);
-               dump_stack();
+               dump_stack_lvl(KERN_ERR);
                return -EINVAL;
        }
        va_start(args, fmt);
@@ -588,7 +590,7 @@ static void __kobject_del(struct kobject *kobj)
 
        /* send "remove" if the caller did not do it but sent "add" */
        if (kobj->state_add_uevent_sent && !kobj->state_remove_uevent_sent) {
-               pr_debug("kobject: '%s' (%p): auto cleanup 'remove' event\n",
+               pr_debug("'%s' (%p): auto cleanup 'remove' event\n",
                         kobject_name(kobj), kobj);
                kobject_uevent(kobj, KOBJ_REMOVE);
        }
@@ -658,16 +660,16 @@ static void kobject_cleanup(struct kobject *kobj)
        const struct kobj_type *t = get_ktype(kobj);
        const char *name = kobj->name;
 
-       pr_debug("kobject: '%s' (%p): %s, parent %p\n",
+       pr_debug("'%s' (%p): %s, parent %p\n",
                 kobject_name(kobj), kobj, __func__, kobj->parent);
 
        if (t && !t->release)
-               pr_debug("kobject: '%s' (%p): does not have a release() function, it is broken and must be fixed. See Documentation/core-api/kobject.rst.\n",
+               pr_debug("'%s' (%p): does not have a release() function, it is broken and must be fixed. See Documentation/core-api/kobject.rst.\n",
                         kobject_name(kobj), kobj);
 
        /* remove from sysfs if the caller did not do it */
        if (kobj->state_in_sysfs) {
-               pr_debug("kobject: '%s' (%p): auto cleanup kobject_del\n",
+               pr_debug("'%s' (%p): auto cleanup kobject_del\n",
                         kobject_name(kobj), kobj);
                __kobject_del(kobj);
        } else {
@@ -676,14 +678,14 @@ static void kobject_cleanup(struct kobject *kobj)
        }
 
        if (t && t->release) {
-               pr_debug("kobject: '%s' (%p): calling ktype release\n",
+               pr_debug("'%s' (%p): calling ktype release\n",
                         kobject_name(kobj), kobj);
                t->release(kobj);
        }
 
        /* free name if we allocated it */
        if (name) {
-               pr_debug("kobject: '%s': free name\n", name);
+               pr_debug("'%s': free name\n", name);
                kfree_const(name);
        }
 
@@ -703,8 +705,8 @@ static void kobject_release(struct kref *kref)
        struct kobject *kobj = container_of(kref, struct kobject, kref);
 #ifdef CONFIG_DEBUG_KOBJECT_RELEASE
        unsigned long delay = HZ + HZ * get_random_u32_below(4);
-       pr_info("kobject: '%s' (%p): %s, parent %p (delayed %ld)\n",
-                kobject_name(kobj), kobj, __func__, kobj->parent, delay);
+       pr_info("'%s' (%p): %s, parent %p (delayed %ld)\n",
+               kobject_name(kobj), kobj, __func__, kobj->parent, delay);
        INIT_DELAYED_WORK(&kobj->release, kobject_delayed_cleanup);
 
        schedule_delayed_work(&kobj->release, delay);
@@ -733,7 +735,7 @@ EXPORT_SYMBOL(kobject_put);
 
 static void dynamic_kobj_release(struct kobject *kobj)
 {
-       pr_debug("kobject: (%p): %s\n", kobj, __func__);
+       pr_debug("(%p): %s\n", kobj, __func__);
        kfree(kobj);
 }
 
@@ -910,7 +912,7 @@ EXPORT_SYMBOL_GPL(kset_find_obj);
 static void kset_release(struct kobject *kobj)
 {
        struct kset *kset = container_of(kobj, struct kset, kobj);
-       pr_debug("kobject: '%s' (%p): %s\n",
+       pr_debug("'%s' (%p): %s\n",
                 kobject_name(kobj), kobj, __func__);
        kfree(kset);
 }