x86: Tidy up EFI code in interrupt_init()

The ll_boot_init() check handles the EFI case so we don't need the rest
of the code. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index fae2544c456f34ce156333d884684570f14c2d96..f3f3527237f2ecfe6bc828823f6f7d6d68721fbd 100644 (file)
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -266,6 +266,10 @@ int interrupt_init(void)
        struct udevice *dev;
        int ret;
 
+       /*
+        * When running as an EFI application we are not in control of
+        * interrupts and should leave them alone.
+        */
        if (!ll_boot_init())
                return 0;
 
@@ -274,11 +278,6 @@ int interrupt_init(void)
        if (ret && ret != -ENODEV)
                return ret;
 
-       /*
-        * When running as an EFI application we are not in control of
-        * interrupts and should leave them alone.
-        */
-#ifndef CONFIG_EFI_APP
        /* Just in case... */
        disable_interrupts();
 
@@ -294,14 +293,8 @@ int interrupt_init(void)
        /* Initialize core interrupt and exception functionality of CPU */
        cpu_init_interrupts();
 
-       /*
-        * It is now safe to enable interrupts.
-        *
-        * TODO(sjg@chromium.org): But we don't handle these correctly when
-        * booted from EFI.
-        */
+       /* It is now safe to enable interrupts */
        enable_interrupts();
-#endif
 
        return 0;
 }