module: do not pass opaque pointer for symbol search

There is no need to use an opaque pointer for check_exported_symbol()
or find_exported_symbol_in_section.

Pass (struct find_symbol_arg *) explicitly.

Signed-off-by: Masahiro Yamada <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>

diff --git a/kernel/module/main.c b/kernel/module/main.c
index ac0a7882899b9bd97c6cc91feb24c628bfa7b12c..d00a8de6d8f54e1ac2f7f16a35288aa3b19a830e 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -244,11 +244,9 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,
 #endif
 
 static bool check_exported_symbol(const struct symsearch *syms,
 #endif
 
 static bool check_exported_symbol(const struct symsearch *syms,

-                                 struct module *owner,
-                                 unsigned int symnum, void *data)
+                                 struct module *owner, unsigned int symnum,
+                                 struct find_symbol_arg *fsa)

 {
 {

-       struct find_symbol_arg *fsa = data;
-

        if (!fsa->gplok && syms->license == GPL_ONLY)
                return false;
        fsa->owner = owner;
        if (!fsa->gplok && syms->license == GPL_ONLY)
                return false;
        fsa->owner = owner;


@@ -285,16 +283,15 @@ int cmp_name(const void *name, const void *sym)
 
 static bool find_exported_symbol_in_section(const struct symsearch *syms,
                                            struct module *owner,
 
 static bool find_exported_symbol_in_section(const struct symsearch *syms,
                                            struct module *owner,

-                                           void *data)
+                                           struct find_symbol_arg *fsa)

 {
 {

-       struct find_symbol_arg *fsa = data;

        struct kernel_symbol *sym;
 
        sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
                        sizeof(struct kernel_symbol), cmp_name);
 
        if (sym != NULL && check_exported_symbol(syms, owner,
        struct kernel_symbol *sym;
 
        sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
                        sizeof(struct kernel_symbol), cmp_name);
 
        if (sym != NULL && check_exported_symbol(syms, owner,

-                                                sym - syms->start, data))
+                                                sym - syms->start, fsa))

                return true;
 
        return false;
                return true;
 
        return false;