[PATCH 4/5] xtensa: remove unreachable memblock_reserve() return value checks
From: Sang-Heon Jeon
Date: Tue Jun 16 2026 - 14:31:14 EST
mem_reserve() wraps memblock_reserve(), and its callers check the return
value. xtensa never calls memblock_allow_resize(), so memblock_reserve()
either succeeds or panics, never returning an error.
Therefore the return value checks are unreachable, so remove them and make
mem_reserve() return void.
No functional change.
Signed-off-by: Sang-Heon Jeon <ekffu200098@xxxxxxxxx>
---
arch/xtensa/kernel/setup.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index f72e280363be..c7367b81cc36 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -268,10 +268,10 @@ void __init init_arch(bp_tag_t *bp_start)
* Initialize system. Setup memory and reserve regions.
*/
-static inline int __init_memblock mem_reserve(unsigned long start,
- unsigned long end)
+static inline void __init_memblock mem_reserve(unsigned long start,
+ unsigned long end)
{
- return memblock_reserve(start, end - start);
+ memblock_reserve(start, end - start);
}
void __init setup_arch(char **cmdline_p)
@@ -290,11 +290,12 @@ void __init setup_arch(char **cmdline_p)
/* Reserve some memory regions */
#ifdef CONFIG_BLK_DEV_INITRD
- if (initrd_start < initrd_end &&
- !mem_reserve(__pa(initrd_start), __pa(initrd_end)))
+ if (initrd_start < initrd_end) {
+ mem_reserve(__pa(initrd_start), __pa(initrd_end));
initrd_below_start_ok = 1;
- else
+ } else {
initrd_start = 0;
+ }
#endif
mem_reserve(__pa(_stext), __pa(_end));
--
2.43.0