iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/efi: Style neatening

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

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Joe Perches 2014-01-03 16:08:48 -08:00 committed by Matt Fleming
parent 5db80c6514
commit 9b7d204982
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/x86/platform/efi/efi.c
View File

@ -67,7 +67,7 @@ struct efi_memory_map memmap;
static struct efi efi_phys __initdata; static struct efi efi_phys __initdata;
static efi_system_table_t efi_systab __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 #ifdef CONFIG_X86_UV
{UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab}, {UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
#endif #endif
@ -76,7 +76,7 @@ static __initdata efi_config_table_type_t arch_tables[] = {
u64 efi_setup; /* efi setup_data physical address */ 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) static int __init setup_noefi(char *arg)
{ {
disable_runtime = true; disable_runtime = true;
@ -263,9 +263,9 @@ static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
int efi_set_rtc_mmss(const struct timespec *now) int efi_set_rtc_mmss(const struct timespec *now)
{ {
unsigned long nowtime = now->tv_sec; unsigned long nowtime = now->tv_sec;
efi_status_t status; efi_status_t status;
efi_time_t eft; efi_time_t eft;
efi_time_cap_t cap; efi_time_cap_t cap;
struct rtc_time tm; struct rtc_time tm;
status = efi.get_time(&eft, &cap); status = efi.get_time(&eft, &cap);
@ -283,9 +283,8 @@ int efi_set_rtc_mmss(const struct timespec *now)
eft.second = tm.tm_sec; eft.second = tm.tm_sec;
eft.nanosecond = 0; eft.nanosecond = 0;
} else { } else {
printk(KERN_ERR pr_err("%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n",
"%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n", __func__, nowtime);
__FUNCTION__, nowtime);
return -1; return -1;
} }
@ -401,8 +400,7 @@ static void __init print_efi_memmap(void)
p < memmap.map_end; p < memmap.map_end;
p += memmap.desc_size, i++) { p += memmap.desc_size, i++) {
md = p; md = p;
pr_info("mem%02u: type=%u, attr=0x%llx, " pr_info("mem%02u: type=%u, attr=0x%llx, range=[0x%016llx-0x%016llx) (%lluMB)\n",
"range=[0x%016llx-0x%016llx) (%lluMB)\n",
i, md->type, md->attribute, md->phys_addr, i, md->type, md->attribute, md->phys_addr,
md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT), md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
(md->num_pages >> (20 - EFI_PAGE_SHIFT))); (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
@ -434,9 +432,8 @@ void __init efi_reserve_boot_services(void)
memblock_is_region_reserved(start, size)) { memblock_is_region_reserved(start, size)) {
/* Could not reserve, skip it */ /* Could not reserve, skip it */
md->num_pages = 0; md->num_pages = 0;
memblock_dbg("Could not reserve boot range " memblock_dbg("Could not reserve boot range [0x%010llx-0x%010llx]\n",
"[0x%010llx-0x%010llx]\n", start, start+size-1);
start, start+size-1);
} else } else
memblock_reserve(start, size); memblock_reserve(start, size);
} }
@ -572,8 +569,7 @@ static int __init efi_systab_init(void *phys)
return -EINVAL; return -EINVAL;
} }
if ((efi.systab->hdr.revision >> 16) == 0) if ((efi.systab->hdr.revision >> 16) == 0)
pr_err("Warning: System table version " pr_err("Warning: System table version %d.%02d, expected 1.00 or greater!\n",
"%d.%02d, expected 1.00 or greater!\n",
efi.systab->hdr.revision >> 16, efi.systab->hdr.revision >> 16,
efi.systab->hdr.revision & 0xffff); efi.systab->hdr.revision & 0xffff);