Skip to content

Commit

Permalink
x86/efi: Simplify EFI_DEBUG
Browse files Browse the repository at this point in the history
... and lose one #ifdef .. #endif sandwich.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Borislav Petkov authored and Matt Fleming committed Nov 2, 2013
1 parent 72548e8 commit f4fccac
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions arch/x86/platform/efi/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -398,9 +398,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;
Expand All @@ -415,8 +415,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)
{
Expand Down Expand Up @@ -696,10 +696,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)
Expand Down

0 comments on commit f4fccac

Please sign in to comment.