remove "struct subsystem" as it is no longer needed

We need to work on cleaning up the relationship between kobjects, ksets and
ktypes.  The removal of 'struct subsystem' is the first step of this,
especially as it is not really needed at all.

Thanks to Kay for fixing the bugs in this patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 3 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 9da5af668a20..ff982ec435fc 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -45,6 +45,8 @@
 #include <asm/cacheflush.h>
 #include <linux/license.h>
 
+extern int module_sysfs_initialized;
+
 #if 0
 #define DEBUGP printk
 #else
@@ -1117,8 +1119,8 @@ int mod_sysfs_init(struct module *mod)
 {
         int err;
 
-        if (!module_subsys.kset.subsys) {
-                printk(KERN_ERR "%s: module_subsys not initialized\n",
+        if (!module_sysfs_initialized) {
+                printk(KERN_ERR "%s: module sysfs not initialized\n",
                        mod->name);
                 err = -EINVAL;
                 goto out;
@@ -2385,7 +2387,7 @@ void module_add_driver(struct module *mod, struct device_driver *drv)
                 struct kobject *mkobj;
 
                 /* Lookup built-in module entry in /sys/modules */
-                mkobj = kset_find_obj(&module_subsys.kset, drv->mod_name);
+                mkobj = kset_find_obj(&module_subsys, drv->mod_name);
                 if (mkobj) {
                         mk = container_of(mkobj, struct module_kobject, kobj);
                         /* remember our module structure */