1 files changed, 11 insertions, 33 deletions

diff --git a/kernel/params.c b/kernel/params.c
index dfef46474e55..67f65ee7211d 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -560,11 +560,10 @@ static void __init kernel_param_sysfs_setup(const char *name,
         BUG_ON(!mk);
 
         mk->mod = THIS_MODULE;
-        kobj_set_kset_s(mk, module_subsys);
-        kobject_set_name(&mk->kobj, name);
-        kobject_init(&mk->kobj);
-        ret = kobject_add(&mk->kobj);
+        mk->kobj.kset = module_kset;
+        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");
@@ -679,8 +678,6 @@ static struct sysfs_ops module_sysfs_ops = {
         .store = module_attr_store,
 };
 
-static struct kobj_type module_ktype;
-
 static int uevent_filter(struct kset *kset, struct kobject *kobj)
 {
         struct kobj_type *ktype = get_ktype(kobj);
@@ -694,21 +691,11 @@ static struct kset_uevent_ops module_uevent_ops = {
         .filter = uevent_filter,
 };
 
-decl_subsys(module, &module_ktype, &module_uevent_ops);
+struct kset *module_kset;
 int module_sysfs_initialized;
 
-static void module_release(struct kobject *kobj)
-{
-        /*
-         * Stupid empty release function to allow the memory for the kobject to
-         * be properly cleaned up.  This will not need to be present for 2.6.25
-         * with the upcoming kobject core rework.
-         */
-}
-
-static struct kobj_type module_ktype = {
+struct kobj_type module_ktype = {
         .sysfs_ops =    &module_sysfs_ops,
-        .release =      module_release,
 };
 
 /*
@@ -716,13 +703,11 @@ static struct kobj_type module_ktype = {
  */
 static int __init param_sysfs_init(void)
 {
-        int ret;
-
-        ret = subsystem_register(&module_subsys);
-        if (ret < 0) {
-                printk(KERN_WARNING "%s (%d): subsystem_register error: %d\n",
-                        __FILE__, __LINE__, ret);
-                return ret;
+        module_kset = kset_create_and_add("module", &module_uevent_ops, NULL);
+        if (!module_kset) {
+                printk(KERN_WARNING "%s (%d): error creating kset\n",
+                        __FILE__, __LINE__);
+                return -ENOMEM;
         }
         module_sysfs_initialized = 1;
 
@@ -732,14 +717,7 @@ static int __init param_sysfs_init(void)
 }
 subsys_initcall(param_sysfs_init);
 
-#else
-#if 0
-static struct sysfs_ops module_sysfs_ops = {
-        .show = NULL,
-        .store = NULL,
-};
-#endif
-#endif
+#endif /* CONFIG_SYSFS */
 
 EXPORT_SYMBOL(param_set_byte);
 EXPORT_SYMBOL(param_get_byte);