kobject: get rid of kobject_kset_add_dir

kobject_kset_add_dir is only called in one place so remove it and use
kobject_create() instead.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 992eba3289b..7762ee86697 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -571,6 +571,8 @@ static struct kobject *virtual_device_parent(struct device *dev)
 static struct kobject * get_device_parent(struct device *dev,
                                           struct device *parent)
 {
+        int retval;
+
         if (dev->class) {
                 struct kobject *kobj = NULL;
                 struct kobject *parent_kobj;
@@ -600,8 +602,18 @@ static struct kobject * get_device_parent(struct device *dev,
                         return kobj;
 
                 /* or create a new class-directory at the parent device */
-                return kobject_kset_add_dir(&dev->class->class_dirs,
-                                            parent_kobj, dev->class->name);
+                k = kobject_create();
+                if (!k)
+                        return NULL;
+                k->kset = &dev->class->class_dirs;
+                retval = kobject_add_ng(k, parent_kobj, "%s", dev->class->name);
+                if (retval < 0) {
+                        kobject_put(k);
+                        return NULL;
+                }
+                /* Do not emit a uevent, as it's not needed for this
+                 * "class glue" directory. */
+                return k;
         }
 
         if (parent)