Commit 9b7d2049 authored by Joe Perches's avatar Joe Perches Committed by Matt Fleming
Browse files

x86/efi: Style neatening 



Coalesce formats and remove spaces before tabs.
Move __initdata after the variable declaration.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 5db80c65

arch/x86/platform/efi/efi.c

+11 −15
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct efi_memory_map memmap; 
static struct efi efi_phys __initdata;

static efi_system_table_t efi_systab __initdata;



static __initdata efi_config_table_type_t arch_tables[] = {

static efi_config_table_type_t arch_tables[] __initdata = {

#ifdef CONFIG_X86_UV

	{UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},

#endif
@@ -76,7 +76,7 @@ static __initdata efi_config_table_type_t arch_tables[] = { 


u64 efi_setup;		/* efi setup_data physical address */



static bool __initdata disable_runtime = false;

static bool disable_runtime __initdata = false;

static int __init setup_noefi(char *arg)

{

	disable_runtime = true;
@@ -283,9 +283,8 @@ int efi_set_rtc_mmss(const struct timespec *now) 
		eft.second = tm.tm_sec;

		eft.nanosecond = 0;

	} else {

		printk(KERN_ERR

		       "%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n",

		       __FUNCTION__, nowtime);

		pr_err("%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n",

		       __func__, nowtime);

		return -1;

	}
@@ -401,8 +400,7 @@ static void __init print_efi_memmap(void) 
	     p < memmap.map_end;

	     p += memmap.desc_size, i++) {

		md = p;

		pr_info("mem%02u: type=%u, attr=0x%llx, "

			"range=[0x%016llx-0x%016llx) (%lluMB)\n",

		pr_info("mem%02u: type=%u, attr=0x%llx, range=[0x%016llx-0x%016llx) (%lluMB)\n",

			i, md->type, md->attribute, md->phys_addr,

			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),

			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
@@ -434,8 +432,7 @@ void __init efi_reserve_boot_services(void) 
			memblock_is_region_reserved(start, size)) {

			/* Could not reserve, skip it */

			md->num_pages = 0;

			memblock_dbg("Could not reserve boot range "

					"[0x%010llx-0x%010llx]\n",

			memblock_dbg("Could not reserve boot range [0x%010llx-0x%010llx]\n",

				     start, start+size-1);

		} else

			memblock_reserve(start, size);
@@ -572,8 +569,7 @@ static int __init efi_systab_init(void *phys) 
		return -EINVAL;

	}

	if ((efi.systab->hdr.revision >> 16) == 0)

		pr_err("Warning: System table version "

		       "%d.%02d, expected 1.00 or greater!\n",

		pr_err("Warning: System table version %d.%02d, expected 1.00 or greater!\n",

		       efi.systab->hdr.revision >> 16,

		       efi.systab->hdr.revision & 0xffff);