diff options
| -rw-r--r-- | include/linux/kobject.h | 1 | ||||
| -rw-r--r-- | lib/kobject.c | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 84c5afd58899..53458b674fae 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -78,7 +78,6 @@ static inline const char * kobject_name(const struct kobject * kobj) return kobj->k_name; } -extern void kobject_init(struct kobject *); extern void kobject_init_ng(struct kobject *kobj, struct kobj_type *ktype); extern int __must_check kobject_add(struct kobject *kobj, struct kobject *parent, diff --git a/lib/kobject.c b/lib/kobject.c index 359e114790cb..10d977b6e69d 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -124,11 +124,7 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask) } EXPORT_SYMBOL_GPL(kobject_get_path); -/** - * kobject_init - initialize object. - * @kobj: object in question. - */ -void kobject_init(struct kobject * kobj) +static void kobject_init_internal(struct kobject * kobj) { if (!kobj) return; @@ -232,7 +228,7 @@ int kobject_register(struct kobject * kobj) { int error = -EINVAL; if (kobj) { - kobject_init(kobj); + kobject_init_internal(kobj); error = kobject_add(kobj); if (!error) kobject_uevent(kobj, KOBJ_ADD); @@ -695,7 +691,7 @@ EXPORT_SYMBOL_GPL(kobject_create_and_add); void kset_init(struct kset * k) { - kobject_init(&k->kobj); + kobject_init_internal(&k->kobj); INIT_LIST_HEAD(&k->list); spin_lock_init(&k->list_lock); } @@ -887,7 +883,6 @@ struct kset *kset_create_and_add(const char *name, } EXPORT_SYMBOL_GPL(kset_create_and_add); -EXPORT_SYMBOL(kobject_init); EXPORT_SYMBOL(kobject_register); EXPORT_SYMBOL(kobject_unregister); EXPORT_SYMBOL(kobject_get); |