sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86 acpi: remove ALIGN_CURRENT macro

Browse Source 
The ALIGN_CURRENT macro relied on a local variable name
as well as being defined in numerous compilation units.
Replace those instances with an acpi_align_current()
inline function.

Change-Id: Iab453f2eda1addefad8a1c37d265f917bd803202
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/12707
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin
2015-12-10 17:07:38 -06:00
parent ecd4cfcb86
commit 07a1b281a8
11 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/southbridge/intel/lynxpoint/lpc.c
View File

@@ -781,7 +781,6 @@ static void southbridge_inject_dsdt(device_t dev)
}
}
#define ALIGN_CURRENT current = (ALIGN(current, 16))
static unsigned long southbridge_write_acpi_tables(device_t device,
unsigned long start,
struct acpi_rsdp *rsdp)
@@ -793,7 +792,7 @@ static unsigned long southbridge_write_acpi_tables(device_t device,
current = start;
/* Align ACPI tables to 16byte */
ALIGN_CURRENT;
current = acpi_align_current(current);
/*
* We explicitly add these tables later on:
@@ -802,18 +801,18 @@ static unsigned long southbridge_write_acpi_tables(device_t device,
hpet = (acpi_hpet_t *) current;
current += sizeof(acpi_hpet_t);
ALIGN_CURRENT;
current = acpi_align_current(current);
acpi_create_intel_hpet(hpet);
acpi_add_table(rsdp, hpet);
ALIGN_CURRENT;
current = acpi_align_current(current);
printk(BIOS_DEBUG, "ACPI: * SSDT2\n");
ssdt = (acpi_header_t *)current;
acpi_create_serialio_ssdt(ssdt);
current += ssdt->length;
acpi_add_table(rsdp, ssdt);
ALIGN_CURRENT;
current = acpi_align_current(current);
printk(BIOS_DEBUG, "current = %lx\n", current);
return current;