Cleanup call stack

Author: jasoncouture

uefi/src/main.rs

@@ -146,16 +146,12 @@ fn load_ramdisk(image: Handle, st: &SystemTable<Boot>) -> Option<&'static [u8]>
 }
 
 fn load_kernel(image: Handle, st: &SystemTable<Boot>) -> Kernel<'static> {
-    let kernel_slice = load_kernel_file(image, st).expect("couldn't find kernel");
+    let kernel_slice = load_file_from_disk(KERNEL_FILENAME, image, st)
+        .or_else(|| load_kernel_file_from_tftp_boot_server(KERNEL_FILENAME, image, st))
+        .expect("couldn't find kernel");
     Kernel::parse(kernel_slice)
 }
 
-/// Try to load a kernel file from the boot device.
-fn load_kernel_file(image: Handle, st: &SystemTable<Boot>) -> Option<&'static mut [u8]> {
-    load_kernel_file_from_disk(image, st)
-        .or_else(|| load_kernel_file_from_tftp_boot_server(image, st))
-}
-
 fn load_file_from_disk(
     name: &str,
     image: Handle,
@@ -264,12 +260,9 @@ fn load_file_from_disk(
     Some(file_slice)
 }
 
-fn load_kernel_file_from_disk(image: Handle, st: &SystemTable<Boot>) -> Option<&'static mut [u8]> {
-    load_file_from_disk(KERNEL_FILENAME, image, st)
-}
-
 /// Try to load a kernel from a TFTP boot server.
 fn load_kernel_file_from_tftp_boot_server(
+    name: &str,
     image: Handle,
     st: &SystemTable<Boot>,
 ) -> Option<&'static mut [u8]> {