[PATCH 01/11] efi: Simplify EFI_DEBUG

Borislav Petkov
2013-09-19T14:54:44Z

From: Borislav Petkov <bp-l3A5Bk7waGM@public.gmane.org>

... and lose one #ifdef .. #endif sandwich.

Signed-off-by: Borislav Petkov <bp-l3A5Bk7waGM@public.gmane.org>
---
arch/x86/platform/efi/efi.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 90f6ed127096..7cec1e9e5494 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,7 @@
#include <asm/x86_init.h>
#include <asm/rtc.h>

-#define EFI_DEBUG 1
+#define EFI_DEBUG

#define EFI_MIN_RESERVE 5120

@@ -402,9 +402,9 @@ int __init efi_memblock_x86_reserve_range(void)
return 0;
}

-#if EFI_DEBUG
static void __init print_efi_memmap(void)
{
+#ifdef EFI_DEBUG
efi_memory_desc_t *md;
void *p;
int i;
@@ -419,8 +419,8 @@ static void __init print_efi_memmap(void)
md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
}
-}
#endif /* EFI_DEBUG */
+}

void __init efi_reserve_boot_services(void)
{
@@ -774,10 +774,7 @@ void __init efi_init(void)
x86_platform.set_wallclock = efi_set_rtc_mmss;
}
#endif
-
-#if EFI_DEBUG
print_efi_memmap();
-#endif
}

void __init efi_late_init(void)
--
1.8.4