diff options
-rw-r--r-- | include/linux/kobject.h | 1 | ||||
-rw-r--r-- | lib/kobject.c | 13 |
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 { | |||
158 | }; | 158 | }; |
159 | 159 | ||
160 | extern void kset_init(struct kset * k); | 160 | extern void kset_init(struct kset * k); |
161 | extern int __must_check kset_add(struct kset * k); | ||
162 | extern int __must_check kset_register(struct kset * k); | 161 | extern int __must_check kset_register(struct kset * k); |
163 | extern void kset_unregister(struct kset * k); | 162 | extern void kset_unregister(struct kset * k); |
164 | extern struct kset * __must_check kset_create_and_add(const char *name, | 163 | 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 = { | |||
710 | }; | 710 | }; |
711 | 711 | ||
712 | /** | 712 | /** |
713 | * kset_add - add a kset object to the hierarchy. | ||
714 | * @k: kset. | ||
715 | */ | ||
716 | |||
717 | int kset_add(struct kset * k) | ||
718 | { | ||
719 | return kobject_add_internal(&k->kobj); | ||
720 | } | ||
721 | |||
722 | |||
723 | /** | ||
724 | * kset_register - initialize and add a kset. | 713 | * kset_register - initialize and add a kset. |
725 | * @k: kset. | 714 | * @k: kset. |
726 | */ | 715 | */ |
@@ -733,7 +722,7 @@ int kset_register(struct kset * k) | |||
733 | return -EINVAL; | 722 | return -EINVAL; |
734 | 723 | ||
735 | kset_init(k); | 724 | kset_init(k); |
736 | err = kset_add(k); | 725 | err = kobject_add_internal(&k->kobj); |
737 | if (err) | 726 | if (err) |
738 | return err; | 727 | return err; |
739 | kobject_uevent(&k->kobj, KOBJ_ADD); | 728 | kobject_uevent(&k->kobj, KOBJ_ADD); |