modpost: remove is_vmlinux() helper

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>
This commit is contained in:
Masahiro Yamada 2020-06-01 14:57:30 +09:00
Родитель a82f794c41
Коммит 4de7b62936
1 изменённых файлов: 1 добавлений и 15 удалений

Просмотреть файл

@ -88,20 +88,6 @@ static inline bool strends(const char *str, const char *postfix)
return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0; 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) void *do_nofail(void *ptr, const char *expr)
{ {
if (!ptr) if (!ptr)
@ -181,7 +167,7 @@ static struct module *new_module(const char *modname)
/* add to list */ /* add to list */
strcpy(mod->name, modname); strcpy(mod->name, modname);
mod->is_vmlinux = is_vmlinux(modname); mod->is_vmlinux = (strcmp(modname, "vmlinux") == 0);
mod->gpl_compatible = -1; mod->gpl_compatible = -1;
mod->next = modules; mod->next = modules;
modules = mod; modules = mod;