[PATCH] mm/memblock: simplify reserve_mem_init error handling
From: Hongfu Li
Date: Thu Aug 20 2026 - 23:40:32 EST
From: Hongfu Li <lihongfu@xxxxxxxxxx>
Return prepare_kho_fdt() directly instead of assigning to a local and
returning it on both success and failure paths.
Signed-off-by: Hongfu Li <lihongfu@xxxxxxxxxx>
---
mm/memblock.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 777c69f05400..7079b93ec730 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -2616,15 +2616,10 @@ static int __init prepare_kho_fdt(void)
static int __init reserve_mem_init(void)
{
- int err;
-
if (!kho_is_enabled() || !reserved_mem_count)
return 0;
- err = prepare_kho_fdt();
- if (err)
- return err;
- return err;
+ return prepare_kho_fdt();
}
late_initcall(reserve_mem_init);
--
2.54.0