Skip to content

Commit

Permalink
Kobject: remove kobject_add() as no one uses it anymore
Browse files Browse the repository at this point in the history
The old kobject_add() 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 ac3c814 commit 9e7bbcc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
1 change: 0 additions & 1 deletion include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ static inline const char * kobject_name(const struct kobject * kobj)

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 *);
extern int __must_check kobject_add_ng(struct kobject *kobj,
struct kobject *parent,
const char *fmt, ...);
Expand Down
22 changes: 8 additions & 14 deletions lib/kobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void kobject_init(struct kobject * kobj)
* Remove the kobject from the kset list and decrement
* its parent's refcount.
* This is separated out, so we can use it in both
* kobject_del() and kobject_add() on error.
* kobject_del() and kobject_add_internal() on error.
*/

static void unlink(struct kobject * kobj)
Expand All @@ -161,12 +161,7 @@ static void unlink(struct kobject * kobj)
kobject_put(parent);
}

/**
* kobject_add - add an object to the hierarchy.
* @kobj: object.
*/

int kobject_add(struct kobject * kobj)
static int kobject_add_internal(struct kobject *kobj)
{
int error = 0;
struct kobject * parent;
Expand Down Expand Up @@ -215,13 +210,13 @@ int kobject_add(struct kobject * kobj)

/* be noisy on error issues */
if (error == -EEXIST)
printk(KERN_ERR "kobject_add failed for %s with "
printk(KERN_ERR "%s failed for %s with "
"-EEXIST, don't try to register things with "
"the same name in the same directory.\n",
kobject_name(kobj));
__FUNCTION__, kobject_name(kobj));
else
printk(KERN_ERR "kobject_add failed for %s (%d)\n",
kobject_name(kobj), error);
printk(KERN_ERR "%s failed for %s (%d)\n",
__FUNCTION__, kobject_name(kobj), error);
dump_stack();
}

Expand Down Expand Up @@ -351,7 +346,7 @@ static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
return retval;
}
kobj->parent = parent;
return kobject_add(kobj);
return kobject_add_internal(kobj);
}

/**
Expand Down Expand Up @@ -742,7 +737,7 @@ struct sysfs_ops kobj_sysfs_ops = {

int kset_add(struct kset * k)
{
return kobject_add(&k->kobj);
return kobject_add_internal(&k->kobj);
}


Expand Down Expand Up @@ -897,7 +892,6 @@ EXPORT_SYMBOL(kobject_register);
EXPORT_SYMBOL(kobject_unregister);
EXPORT_SYMBOL(kobject_get);
EXPORT_SYMBOL(kobject_put);
EXPORT_SYMBOL(kobject_add);
EXPORT_SYMBOL(kobject_del);

EXPORT_SYMBOL(kset_register);
Expand Down

0 comments on commit 9e7bbcc

Please sign in to comment.