Skip to content

Commit

Permalink
Kobject: convert kernel/params.c to use kobject_init/add_ng()
Browse files Browse the repository at this point in the history
This converts the code to use the new kobject functions, cleaning up the
logic in doing so.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
gregkh committed Jan 25, 2008
1 parent a5815dd commit e43b919
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/params.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,9 @@ static void __init kernel_param_sysfs_setup(const char *name,

mk->mod = THIS_MODULE;
mk->kobj.kset = module_kset;
mk->kobj.ktype = &module_ktype;
kobject_set_name(&mk->kobj, name);
kobject_init(&mk->kobj);
ret = kobject_add(&mk->kobj);
ret = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, "%s", name);
if (ret) {
kobject_put(&mk->kobj);
printk(KERN_ERR "Module '%s' failed to be added to sysfs, "
"error number %d\n", name, ret);
printk(KERN_ERR "The system will be unstable now.\n");
Expand Down

0 comments on commit e43b919

Please sign in to comment.