kobject: get rid of kobject_add_dir

kobject_create_and_add is the same as kobject_add_dir, so drop
kobject_add_dir.

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

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c8f2ac03d46d7f3e9cd5d7454ce4f1ad43e52d75..992eba3289bdc6d0326468bbb3d93323ff5d223b 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -562,7 +562,8 @@ static struct kobject *virtual_device_parent(struct device *dev)
        static struct kobject *virtual_dir = NULL;
 
        if (!virtual_dir)
-               virtual_dir = kobject_add_dir(&devices_subsys.kobj, "virtual");
+               virtual_dir = kobject_create_and_add("virtual",
+                                                    &devices_subsys.kobj);
 
        return virtual_dir;
 }

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 722e12e5acc71e9b90051da29f5611b5e3182f9c..69685bb51c62836da683eb1be57da565788d834c 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -335,7 +335,7 @@ static inline void partition_sysfs_add_subdir(struct hd_struct *p)
        struct kobject *k;
 
        k = kobject_get(&p->kobj);
-       p->holder_dir = kobject_add_dir(k, "holders");
+       p->holder_dir = kobject_create_and_add("holders", k);
        kobject_put(k);
 }
 
@@ -344,8 +344,8 @@ static inline void disk_sysfs_add_subdirs(struct gendisk *disk)
        struct kobject *k;
 
        k = kobject_get(&disk->kobj);
-       disk->holder_dir = kobject_add_dir(k, "holders");
-       disk->slave_dir = kobject_add_dir(k, "slaves");
+       disk->holder_dir = kobject_create_and_add("holders", k);
+       disk->slave_dir = kobject_create_and_add("slaves", k);
        kobject_put(k);
 }
 

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 33e7a6142a753d6fdd3e8b030389e84cfd6ca54b..7b09136fb2113b6b8a23a014865d2ae80a468d9b 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -105,7 +105,6 @@ extern void kobject_put(struct kobject *);
 
 extern struct kobject *kobject_kset_add_dir(struct kset *kset,
                                            struct kobject *, const char *);
-extern struct kobject *kobject_add_dir(struct kobject *, const char *);
 
 extern char * kobject_get_path(struct kobject *, gfp_t);
 

diff --git a/kernel/module.c b/kernel/module.c
index 68df79738b3baca6d4f99b4a361c3f7686c8570f..55142775c581b47242fde7571aefbf4402513fb0 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1122,7 +1122,7 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
                ++loaded;
        }
 
-       notes_attrs->dir = kobject_add_dir(&mod->mkobj.kobj, "notes");
+       notes_attrs->dir = kobject_create_and_add("notes", &mod->mkobj.kobj);
        if (!notes_attrs->dir)
                goto out;
 
@@ -1243,7 +1243,7 @@ int mod_sysfs_setup(struct module *mod,
        if (err)
                goto out;
 
-       mod->holders_dir = kobject_add_dir(&mod->mkobj.kobj, "holders");
+       mod->holders_dir = kobject_create_and_add("holders", &mod->mkobj.kobj);
        if (!mod->holders_dir) {
                err = -ENOMEM;
                goto out_unreg;
@@ -2521,7 +2521,7 @@ static void module_create_drivers_dir(struct module_kobject *mk)
        if (!mk || mk->drivers_dir)
                return;
 
-       mk->drivers_dir = kobject_add_dir(&mk->kobj, "drivers");
+       mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)

diff --git a/lib/kobject.c b/lib/kobject.c
index 98422a3eeffc8d7ff18ed8c60e09eee9a42bf0da..96b61d9a9284ada9fa77430ff0779a86b7d81510 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -712,18 +712,6 @@ 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_create_and_add(name, parent);
-}
-
 /**
  *     kset_init - initialize a kset for use
  *     @k:     kset