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>

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 25908475861762078d9e638d408d2682d8274b24..63967da073afbaf87b0d3a5cf56e1529ba7ebcbd 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -158,7 +158,6 @@ struct kset {
 };
 
 extern void kset_init(struct kset * k);
 };
 
 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,
 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 3326281c96b660a07020fac61c4a4a5ffbb81602..c321f1910cc2bd944161046a58d7d68ef3b76c65 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -709,17 +709,6 @@ struct sysfs_ops kobj_sysfs_ops = {
        .store  = kobj_attr_store,
 };
 
        .store  = kobj_attr_store,
 };
 

-/**
- *     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.
 /**
  *     kset_register - initialize and add a kset.
  *     @k:     kset.


@@ -733,7 +722,7 @@ int kset_register(struct kset * k)
                return -EINVAL;
 
        kset_init(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);
        if (err)
                return err;
        kobject_uevent(&k->kobj, KOBJ_ADD);