[PATCH 2/3] x86/setup: Simplify copy error handling in relocate_initrd()

From: Thorsten Blum

Date: Wed Aug 26 2026 - 14:16:09 EST


Check the result of copy_from_early_mem() directly and drop the
now-obsolete local ret variable.

No functional change.

Signed-off-by: Thorsten Blum <blum@xxxxxxxxxx>
---
arch/x86/kernel/setup.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 1fede9834835..fa1a7c29285e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -322,7 +322,6 @@ static void __init relocate_initrd(void)
u64 ramdisk_image = get_ramdisk_image();
u64 ramdisk_size = get_ramdisk_size();
u64 area_size = PAGE_ALIGN(ramdisk_size);
- int ret = 0;

/* We need to move the initrd down into directly mapped mem */
u64 relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0,
@@ -336,8 +335,7 @@ static void __init relocate_initrd(void)
printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
relocated_ramdisk, relocated_ramdisk + area_size - 1);

- ret = copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_size);
- if (ret)
+ if (copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_size))
panic("Copy RAMDISK failed\n");

printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"