From 6f80ccc357702f87baf43440d97a49bcce999393 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Thu, 16 Mar 2017 15:18:22 -0700 Subject: arch/x86: Wrap lines at 80 columns Fix the following warning detected by checkpatch.pl: WARNING: line over 80 characters TEST=Build and run on Galileo Gen2 Change-Id: I3495cd30d1737d9ee728c8a9e72bd426d7a69c37 Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/18864 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/arch/x86/tables.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'src/arch/x86/tables.c') diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c index 93bd0dd299..7b06550cc5 100644 --- a/src/arch/x86/tables.c +++ b/src/arch/x86/tables.c @@ -41,10 +41,12 @@ static unsigned long write_pirq_table(unsigned long rom_table_end) /* And add a high table version for those payloads that * want to live in the F segment */ - high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_PIRQ, MAX_PIRQ_TABLE_SIZE); + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_PIRQ, + MAX_PIRQ_TABLE_SIZE); if (high_table_pointer) { unsigned long new_high_table_pointer; - new_high_table_pointer = write_pirq_routing_table(high_table_pointer); + new_high_table_pointer = + write_pirq_routing_table(high_table_pointer); // FIXME make pirq table code intelligent enough to know how // much space it's going to need. if (new_high_table_pointer > (high_table_pointer @@ -68,7 +70,8 @@ static unsigned long write_mptable(unsigned long rom_table_end) rom_table_end = write_smp_table(rom_table_end); rom_table_end = ALIGN(rom_table_end, 1024); - high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_MPTABLE, MAX_MP_TABLE_SIZE); + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_MPTABLE, + MAX_MP_TABLE_SIZE); if (high_table_pointer) { unsigned long new_high_table_pointer; new_high_table_pointer = write_smp_table(high_table_pointer); @@ -105,7 +108,8 @@ static unsigned long write_acpi_table(unsigned long rom_table_end) * coreboot table. This leaves us with 47KB for all of ACPI. Let's see * how far we get. */ - high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_ACPI, MAX_ACPI_SIZE); + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_ACPI, + MAX_ACPI_SIZE); if (high_table_pointer) { unsigned long acpi_start = high_table_pointer; unsigned long new_high_table_pointer; @@ -139,7 +143,8 @@ static unsigned long write_acpi_table(unsigned long rom_table_end) writes longest size available. */ memcpy(low_rsdp, high_rsdp, sizeof(acpi_rsdp_t)); } else { - printk(BIOS_ERR, "ERROR: Didn't find RSDP in high table.\n"); + printk(BIOS_ERR, + "ERROR: Didn't find RSDP in high table.\n"); } rom_table_end = ALIGN(rom_table_end + sizeof(acpi_rsdp_t), 16); } else { @@ -156,13 +161,16 @@ static unsigned long write_smbios_table(unsigned long rom_table_end) #define MAX_SMBIOS_SIZE 2048 - high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_SMBIOS, MAX_SMBIOS_SIZE); + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_SMBIOS, + MAX_SMBIOS_SIZE); if (high_table_pointer) { unsigned long new_high_table_pointer; - new_high_table_pointer = smbios_write_tables(high_table_pointer); + new_high_table_pointer = + smbios_write_tables(high_table_pointer); rom_table_end = ALIGN(rom_table_end, 16); - memcpy((void *)rom_table_end, (void *)high_table_pointer, sizeof(struct smbios_entry)); + memcpy((void *)rom_table_end, (void *)high_table_pointer, + sizeof(struct smbios_entry)); rom_table_end += sizeof(struct smbios_entry); if (new_high_table_pointer > (high_table_pointer @@ -171,8 +179,11 @@ static unsigned long write_smbios_table(unsigned long rom_table_end) printk(BIOS_DEBUG, "SMBIOS tables: %ld bytes.\n", new_high_table_pointer - high_table_pointer); } else { - unsigned long new_rom_table_end = smbios_write_tables(rom_table_end); - printk(BIOS_DEBUG, "SMBIOS size %ld bytes\n", new_rom_table_end - rom_table_end); + unsigned long new_rom_table_end; + + new_rom_table_end = smbios_write_tables(rom_table_end); + printk(BIOS_DEBUG, "SMBIOS size %ld bytes\n", new_rom_table_end + - rom_table_end); rom_table_end = ALIGN(new_rom_table_end, 16); } -- cgit v1.2.3