openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kobject: Comment and warning fixes to kobject.c 

This dots some i's and crosses some t's after left over from when
kobject_kset_add_dir was built from kobject_add_dir. 

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric W. Biederman 2007-04-06 10:47:11 -06:00 committed by Greg Kroah-Hartman
parent 22af74f3b2
commit 2753133eb3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/kobject.c
View File

@ -519,7 +519,7 @@ static struct kobj_type dir_ktype = {
}; };
/** /**
* kobject__kset_add_dir - add sub directory of object. * kobject_kset_add_dir - add sub directory of object.
* @kset: kset the directory is belongs to. * @kset: kset the directory is belongs to.
* @parent: object in which a directory is created. * @parent: object in which a directory is created.
* @name: directory name. * @name: directory name.
@ -545,8 +545,8 @@ struct kobject *kobject_kset_add_dir(struct kset *kset,
kobject_set_name(k, name); kobject_set_name(k, name);
ret = kobject_register(k); ret = kobject_register(k);
if (ret < 0) { if (ret < 0) {
printk(KERN_WARNING "kobject_add_dir: " printk(KERN_WARNING "%s: kobject_register error: %d\n",
"kobject_register error: %d\n", ret); __func__, ret);
kobject_del(k); kobject_del(k);
return NULL; return NULL;
} }
@ -554,6 +554,13 @@ struct kobject *kobject_kset_add_dir(struct kset *kset,
return k; return k;
} }
/**
* kobject_add_dir - add sub directory of object.
* @parent: object in which a directory is created.
* @name: directory name.
*
* Add a plain directory object as child of given object.
*/
struct kobject *kobject_add_dir(struct kobject *parent, const char *name) struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
{ {
return kobject_kset_add_dir(NULL, parent, name); return kobject_kset_add_dir(NULL, parent, name);