Skip to content

Commit

Permalink
Kobject: remove kobject_init() as no one uses it anymore
Browse files Browse the repository at this point in the history
The old kobject_init() function is on longer in use, so let us remove it
from the public scope (kset mess in the kobject.c file still uses it,
but that can be cleaned up later very simply.)

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent b2d6db5 commit e1543dd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 3 additions & 8 deletions lib/kobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e1543dd

Please sign in to comment.