Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[firefly-linux-kernel-4.4.55.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index db1d23707eb14f1593e120a944f28d2711f48910..cecf2fbede3e7df743aa48c93be7d93216e1c11a 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -174,6 +174,7 @@ int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent)
        if (!*kobj->k_name) {
                pr_debug("kobject attempted to be registered with no name!\n");
                WARN_ON(1);
+               kobject_put(kobj);
                return -EINVAL;
        }
        parent = kobject_get(kobj->parent);
@@ -518,7 +519,7 @@ static struct kobj_type dir_ktype = {
 };
 
 /**
- *     kobject__kset_add_dir - add sub directory of object.
+ *     kobject_kset_add_dir - add sub directory of object.
  *     @kset:          kset the directory is belongs to.
  *     @parent:        object in which a directory is created.
  *     @name:  directory name.
@@ -544,8 +545,8 @@ struct kobject *kobject_kset_add_dir(struct kset *kset,
        kobject_set_name(k, name);
        ret = kobject_register(k);
        if (ret < 0) {
-               printk(KERN_WARNING "kobject_add_dir: "
-                       "kobject_register error: %d\n", ret);
+               printk(KERN_WARNING "%s: kobject_register error: %d\n",
+                       __func__, ret);
                kobject_del(k);
                return NULL;
        }
@@ -553,6 +554,13 @@ struct kobject *kobject_kset_add_dir(struct kset *kset,
        return k;
 }
 
+/**
+ *     kobject_add_dir - add sub directory of object.
+ *     @parent:        object in which a directory is created.
+ *     @name:  directory name.
+ *
+ *     Add a plain directory object as child of given object.
+ */
 struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 {
        return kobject_kset_add_dir(NULL, parent, name);
@@ -651,7 +659,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
 
 void subsystem_init(struct subsystem * s)
 {
-       init_rwsem(&s->rwsem);
        kset_init(&s->kset);
 }
 
@@ -660,8 +667,7 @@ void subsystem_init(struct subsystem * s)
  *     @s:     the subsystem we're registering.
  *
  *     Once we register the subsystem, we want to make sure that 
- *     the kset points back to this subsystem for correct usage of 
- *     the rwsem. 
+ *     the kset points back to this subsystem.
  */
 
 int subsystem_register(struct subsystem * s)