This converts the code to use the new kobject functions, cleaning up the

logic in doing so.
Cc: Kay Sievers

Signed-off-by: Greg Kroah-Hartman

---

 kernel/module.c |   14 ++++++--------

 1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c

index 0ae8117..89cd4c7 100644

--- a/kernel/module.c

+++ b/kernel/module.c

@@ -1217,18 +1217,16 @@ int mod_sysfs_init(struct module *mod)

 		err = -EINVAL;

 		goto out;

 	}

-	memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));

-	err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);

-	if (err)

-		goto out;

-	mod->mkobj.kobj.kset = module_kset;

-	mod->mkobj.kobj.ktype = &module_ktype;

 	mod->mkobj.mod = mod;
-	kobject_init(&mod->mkobj.kobj);

+	memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));

+	mod->mkobj.kobj.kset = module_kset;

+	err = kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL,

+				   "%s", mod->name);

+	if (err)

+		kobject_put(&mod->mkobj.kobj);
 	/* delay uevent until full sysfs population */

-	err = kobject_add(&mod->mkobj.kobj);

 out:

 	return err;

 }

--

1.5.3.8
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/