aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/kobject.h2
-rw-r--r--lib/kobject.c17
2 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index be03ce83f9cc..504ac0eb4412 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -101,8 +101,6 @@ extern struct kobject * __must_check kobject_create_and_add(const char *name,
101extern int __must_check kobject_rename(struct kobject *, const char *new_name); 101extern int __must_check kobject_rename(struct kobject *, const char *new_name);
102extern int __must_check kobject_move(struct kobject *, struct kobject *); 102extern int __must_check kobject_move(struct kobject *, struct kobject *);
103 103
104extern void kobject_unregister(struct kobject *);
105
106extern struct kobject * kobject_get(struct kobject *); 104extern struct kobject * kobject_get(struct kobject *);
107extern void kobject_put(struct kobject *); 105extern void kobject_put(struct kobject *);
108 106
diff --git a/lib/kobject.c b/lib/kobject.c
index 462946ee3e64..a0773734545c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -533,22 +533,6 @@ void kobject_del(struct kobject * kobj)
533} 533}
534 534
535/** 535/**
536 * kobject_unregister - remove object from hierarchy and decrement refcount.
537 * @kobj: object going away.
538 */
539
540void kobject_unregister(struct kobject * kobj)
541{
542 if (!kobj)
543 return;
544 pr_debug("kobject: '%s' (%p): %s\n",
545 kobject_name(kobj), kobj, __FUNCTION__);
546 kobject_uevent(kobj, KOBJ_REMOVE);
547 kobject_del(kobj);
548 kobject_put(kobj);
549}
550
551/**
552 * kobject_get - increment refcount for object. 536 * kobject_get - increment refcount for object.
553 * @kobj: object. 537 * @kobj: object.
554 */ 538 */
@@ -877,7 +861,6 @@ struct kset *kset_create_and_add(const char *name,
877} 861}
878EXPORT_SYMBOL_GPL(kset_create_and_add); 862EXPORT_SYMBOL_GPL(kset_create_and_add);
879 863
880EXPORT_SYMBOL(kobject_unregister);
881EXPORT_SYMBOL(kobject_get); 864EXPORT_SYMBOL(kobject_get);
882EXPORT_SYMBOL(kobject_put); 865EXPORT_SYMBOL(kobject_put);
883EXPORT_SYMBOL(kobject_del); 866EXPORT_SYMBOL(kobject_del);