[PATCH 28/29] modpost: remove is_vmlinux() helper

Masahiro Yamada
2020-05-17T09:50:17Z

Now that is_vmlinux() is called only in new_module(), we can inline
the function call.

modname is the basename with '.o' is stripped. No need to compare it
with 'vmlinux.o'.

vmlinux is always located at the current working directory. No need
to strip the directory path.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

scripts/mod/modpost.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 6669b3ace968..bcab010f09ce 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -90,20 +90,6 @@ static inline bool strends(const char *str, const char *postfix)
return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
}

-static int is_vmlinux(const char *modname)
-{
- const char *myname;
-
- myname = strrchr(modname, '/');
- if (myname)
- myname++;
- else
- myname = modname;
-
- return (strcmp(myname, "vmlinux") == 0) ||
- (strcmp(myname, "vmlinux.o") == 0);
-}
-
void *do_nofail(void *ptr, const char *expr)
{
if (!ptr)
@@ -170,7 +156,7 @@ static struct module *new_module(const char *modname)

/* add to list */
strcpy(mod->name, modname);
- mod->is_vmlinux = is_vmlinux(modname);
+ mod->is_vmlinux = (strcmp(modname, "vmlinux") == 0);
mod->gpl_compatible = -1;
mod->next = modules;
modules = mod;
--
2.25.1