modpost: use sym_get_data() to get module device_table data

Use sym_get_data() to replace the long code.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index cbd6b0f48b4edb111c1e53ea995120e1283486ab..80d973144fded3b181e07612450b074e83925cfe 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1571,9 +1571,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                zeros = calloc(1, sym->st_size);
                symval = zeros;
        } else {
-               symval = (void *)info->hdr
-                       + info->sechdrs[get_secindex(info, sym)].sh_offset
-                       + sym->st_value;
+               symval = sym_get_data(info, sym);
        }
 
        /* First handle the "special" cases */

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 75aa10413ad40f33aebe237dbe25b27e92d4a3d8..08411fff3e178aa03b5ab4a993d17c262ea05ef4 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -324,7 +324,7 @@ static void *sym_get_data_by_offset(const struct elf_info *info,
        return (void *)info->hdr + sechdr->sh_offset + offset;
 }
 
-static void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym)
+void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym)
 {
        return sym_get_data_by_offset(info, get_secindex(info, sym),
                                      sym->st_value);

diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 044bdfb894b720fcefb786512f2d8b6728d9f6a8..4d8a1ae1d1e3607666e1dd9952a6dfec6e8d230f 100644 (file)
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -187,6 +187,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen);
 /* from modpost.c */
 char *read_text_file(const char *filename);
 char *get_line(char **stringp);
+void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym);
 
 enum loglevel {
        LOG_WARN,