aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-18 01:05:35 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:31 -0500
commite43b9192c59402685bd1f809068dd13aa5931570 (patch)
treee274bbe6234692fa8bd6f09562be6bac8f9dcdac
parenta5815ddf26aa8208d4ad79b4fba5e6bf7d5ba688 (diff)
Kobject: convert kernel/params.c to use kobject_init/add_ng()
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>
-rw-r--r--kernel/params.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/params.c b/kernel/params.c
index 97e092312155..1078b148ca80 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -561,11 +561,9 @@ static void __init kernel_param_sysfs_setup(const char *name,
561 561
562 mk->mod = THIS_MODULE; 562 mk->mod = THIS_MODULE;
563 mk->kobj.kset = module_kset; 563 mk->kobj.kset = module_kset;
564 mk->kobj.ktype = &module_ktype; 564 ret = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, "%s", name);
565 kobject_set_name(&mk->kobj, name);
566 kobject_init(&mk->kobj);
567 ret = kobject_add(&mk->kobj);
568 if (ret) { 565 if (ret) {
566 kobject_put(&mk->kobj);
569 printk(KERN_ERR "Module '%s' failed to be added to sysfs, " 567 printk(KERN_ERR "Module '%s' failed to be added to sysfs, "
570 "error number %d\n", name, ret); 568 "error number %d\n", name, ret);
571 printk(KERN_ERR "The system will be unstable now.\n"); 569 printk(KERN_ERR "The system will be unstable now.\n");