diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2002-04-09 12:14:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:39 -0800 |
| commit | 12e339ac6e31a34fe42396aec8fb1c0b43caf61e (patch) | |
| tree | 28427e04e49ba7b5f1cabd9da33a9240f30acfae | |
| parent | 6d06adfaf82d154023141ddc0c9de18b6a49090b (diff) | |
| download | linux-12e339ac6e31a34fe42396aec8fb1c0b43caf61e.tar.bz2 | |
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>
| -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 { }; 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); |