module: remove redundant module_sysfs_initialized variable

The variable module_sysfs_initialized is used for checking whether
module_kset has been initialized. Checking module_kset itself works
just fine for that.

This is a leftover from commit 7405c1e15edf ("kset: convert /sys/module
to use kset_create").

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
[mcgrof: adjusted commit log as suggested by Christophe Leroy]
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/include/linux/module.h b/include/linux/module.h
index ec61fb53979a92ad164852f50c6c91ffe00deafd..676614d56c2506d40d9e2b7519b289e2e341ac14 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -827,7 +827,6 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr)
 #ifdef CONFIG_SYSFS
 extern struct kset *module_kset;
 extern struct kobj_type module_ktype;
-extern int module_sysfs_initialized;
 #endif /* CONFIG_SYSFS */
 
 #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x)

diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c
index ce68f821dcd125a88fb3af903160f4cdf2a8520b..c921bf044050ff5650394372d400517c83e87bc8 100644 (file)
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@ -340,7 +340,7 @@ static int mod_sysfs_init(struct module *mod)
        int err;
        struct kobject *kobj;
 
-       if (!module_sysfs_initialized) {
+       if (!module_kset) {
                pr_err("%s: module sysfs not initialized\n", mod->name);
                err = -EINVAL;
                goto out;

diff --git a/kernel/params.c b/kernel/params.c
index 5b92310425c50a5314942b14d7866f7fec383c20..8d4e9a3f0df2881bea1478a5f5c523e213fea356 100644 (file)
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -940,7 +940,6 @@ static const struct kset_uevent_ops module_uevent_ops = {
 };
 
 struct kset *module_kset;
-int module_sysfs_initialized;
 
 static void module_kobj_release(struct kobject *kobj)
 {
@@ -964,7 +963,6 @@ static int __init param_sysfs_init(void)
                        __FILE__, __LINE__);
                return -ENOMEM;
        }
-       module_sysfs_initialized = 1;
 
        version_sysfs_builtin();
        param_sysfs_builtin();