Kset: remove kset_add function

No one is calling this anymore, so just remove it and hard-code the one
internal-use of it.

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

2 files changed, 1 insertions, 13 deletions

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 259084758617..63967da073af 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -158,7 +158,6 @@ struct kset {
 };
 
 extern void kset_init(struct kset * k);
-extern int __must_check kset_add(struct kset * k);
 extern int __must_check kset_register(struct kset * k);
 extern void kset_unregister(struct kset * k);
 extern struct kset * __must_check kset_create_and_add(const char *name,
diff --git a/lib/kobject.c b/lib/kobject.c
index 3326281c96b6..c321f1910cc2 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -710,17 +710,6 @@ struct sysfs_ops kobj_sysfs_ops = {
 };
 
 /**
- *      kset_add - add a kset object to the hierarchy.
- *      @k:     kset.
- */
-
-int kset_add(struct kset * k)
-{
-        return kobject_add_internal(&k->kobj);
-}
-
-
-/**
  *      kset_register - initialize and add a kset.
  *      @k:     kset.
  */
@@ -733,7 +722,7 @@ int kset_register(struct kset * k)
                 return -EINVAL;
 
         kset_init(k);
-        err = kset_add(k);
+        err = kobject_add_internal(&k->kobj);
         if (err)
                 return err;
         kobject_uevent(&k->kobj, KOBJ_ADD);