x86 acpi: remove ALIGN_CURRENT macro
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:
@@ -104,7 +104,6 @@ static unsigned long acpi_fill_dmar(unsigned long current)
|
||||
return current;
|
||||
}
|
||||
|
||||
#define ALIGN_CURRENT current = (ALIGN(current, 16))
|
||||
unsigned long northbridge_write_acpi_tables(device_t device,
|
||||
unsigned long start,
|
||||
struct acpi_rsdp *rsdp)
|
||||
@@ -118,10 +117,10 @@ unsigned long northbridge_write_acpi_tables(device_t device,
|
||||
dmar = (acpi_dmar_t *) current;
|
||||
acpi_create_dmar(dmar, 0, acpi_fill_dmar);
|
||||
current += dmar->header.length;
|
||||
ALIGN_CURRENT;
|
||||
current = acpi_align_current(current);
|
||||
acpi_add_table(rsdp, dmar);
|
||||
|
||||
ALIGN_CURRENT;
|
||||
current = acpi_align_current(current);
|
||||
|
||||
printk(BIOS_DEBUG, "current = %lx\n", current);
|
||||
|
||||
|
Reference in New Issue
Block a user