From 1d7764cfe33626f8487febbcb2ad2acc9bd14c2c Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 17 Nov 2025 15:09:52 +0100 Subject: [PATCH] s390/modules: Simplify module_finalize() slightly Preinitialize the return value, and break out the for loop in module_finalize() in case of an error to get rid of an ifdef. This makes it easier to add additional code, which may also depend on config options. Reviewed-by: Sven Schnelle Signed-off-by: Heiko Carstens --- arch/s390/kernel/module.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 91e207b503943..54d99e811a837 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c @@ -495,9 +495,7 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *s; char *secstrings, *secname; void *aseg; -#ifdef CONFIG_FUNCTION_TRACER - int ret; -#endif + int rc = 0; if (IS_ENABLED(CONFIG_EXPOLINE) && !nospec_disable && me->arch.plt_size) { @@ -529,12 +527,12 @@ int module_finalize(const Elf_Ehdr *hdr, #ifdef CONFIG_FUNCTION_TRACER if (!strcmp(FTRACE_CALLSITE_SECTION, secname)) { - ret = module_alloc_ftrace_hotpatch_trampolines(me, s); - if (ret < 0) - return ret; + rc = module_alloc_ftrace_hotpatch_trampolines(me, s); + if (rc) + break; } #endif /* CONFIG_FUNCTION_TRACER */ } - return 0; + return rc; } -- 2.47.3