aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/kobject.h1
-rw-r--r--lib/kobject.c18
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,
96extern int __must_check kobject_rename(struct kobject *, const char *new_name); 96extern int __must_check kobject_rename(struct kobject *, const char *new_name);
97extern int __must_check kobject_move(struct kobject *, struct kobject *); 97extern int __must_check kobject_move(struct kobject *, struct kobject *);
98 98
99extern int __must_check kobject_register(struct kobject *);
100extern void kobject_unregister(struct kobject *); 99extern void kobject_unregister(struct kobject *);
101 100
102extern struct kobject * kobject_get(struct kobject *); 101extern 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)
220} 220}
221 221
222/** 222/**
223 * kobject_register - initialize and add an object.
224 * @kobj: object in question.
225 */
226
227int kobject_register(struct kobject * kobj)
228{
229 int error = -EINVAL;
230 if (kobj) {
231 kobject_init_internal(kobj);
232 error = kobject_add(kobj);
233 if (!error)
234 kobject_uevent(kobj, KOBJ_ADD);
235 }
236 return error;
237}
238
239/**
240 * kobject_set_name_vargs - Set the name of an kobject 223 * kobject_set_name_vargs - Set the name of an kobject
241 * @kobj: struct kobject to set the name of 224 * @kobj: struct kobject to set the name of
242 * @fmt: format string used to build the name 225 * @fmt: format string used to build the name
@@ -883,7 +866,6 @@ struct kset *kset_create_and_add(const char *name,
883} 866}
884EXPORT_SYMBOL_GPL(kset_create_and_add); 867EXPORT_SYMBOL_GPL(kset_create_and_add);
885 868
886EXPORT_SYMBOL(kobject_register);
887EXPORT_SYMBOL(kobject_unregister); 869EXPORT_SYMBOL(kobject_unregister);
888EXPORT_SYMBOL(kobject_get); 870EXPORT_SYMBOL(kobject_get);
889EXPORT_SYMBOL(kobject_put); 871EXPORT_SYMBOL(kobject_put);