diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-19 11:26:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:39 -0800 |
| commit | 6d06adfaf82d154023141ddc0c9de18b6a49090b (patch) | |
| tree | a7a7e3c0458158cc6a93df457470c6fdd30a8c35 | |
| parent | Kobject: rename kobject_init_ng() to kobject_init() (diff) | |
| download | linux-dev-6d06adfaf82d154023141ddc0c9de18b6a49090b.tar.xz linux-dev-6d06adfaf82d154023141ddc0c9de18b6a49090b.zip | |
Kobject: remove kobject_register()
The function is no longer used by anyone in the kernel, and it prevents
the proper sending of the kobject uevent after the needed files are set
up by the caller. kobject_init_and_add() can be used in its place.
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 | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index d9d8c368f044..259084758617 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -96,7 +96,6 @@ extern struct kobject * __must_check kobject_create_and_add(const char *name, extern int __must_check kobject_rename(struct kobject *, const char *new_name); extern int __must_check kobject_move(struct kobject *, struct kobject *); -extern int __must_check kobject_register(struct kobject *); extern void kobject_unregister(struct kobject *); extern struct kobject * kobject_get(struct kobject *); diff --git a/lib/kobject.c b/lib/kobject.c index 4cc231c86225..3326281c96b6 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -220,23 +220,6 @@ static int kobject_add_internal(struct kobject *kobj) } /** - * kobject_register - initialize and add an object. - * @kobj: object in question. - */ - -int kobject_register(struct kobject * kobj) -{ - int error = -EINVAL; - if (kobj) { - kobject_init_internal(kobj); - error = kobject_add(kobj); - if (!error) - kobject_uevent(kobj, KOBJ_ADD); - } - return error; -} - -/** * kobject_set_name_vargs - Set the name of an kobject * @kobj: struct kobject to set the name of * @fmt: format string used to build the name @@ -883,7 +866,6 @@ struct kset *kset_create_and_add(const char *name, } EXPORT_SYMBOL_GPL(kset_create_and_add); -EXPORT_SYMBOL(kobject_register); EXPORT_SYMBOL(kobject_unregister); EXPORT_SYMBOL(kobject_get); EXPORT_SYMBOL(kobject_put); |