From 07a1b281a864e8c2a17e29767a7abf495587b325 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 10 Dec 2015 17:07:38 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/12707 Reviewed-by: Alexandru Gagniuc Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/getac/p470/acpi_tables.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mainboard/getac/p470') diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c index 7228f5c25a..34d6f3494a 100644 --- a/src/mainboard/getac/p470/acpi_tables.c +++ b/src/mainboard/getac/p470/acpi_tables.c @@ -81,7 +81,6 @@ static long acpi_create_ecdt(acpi_ecdt_t * ecdt) return header->length; } -#define ALIGN_CURRENT current = (ALIGN(current, 16)) unsigned long mainboard_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp) @@ -92,12 +91,12 @@ unsigned long mainboard_write_acpi_tables(device_t device, current = start; /* Align ACPI tables to 16byte */ - ALIGN_CURRENT; + current = acpi_align_current(current); printk(BIOS_DEBUG, "ACPI: * ECDT\n"); ecdt = (acpi_header_t *)current; current += acpi_create_ecdt((acpi_ecdt_t *)current); - ALIGN_CURRENT; + current = acpi_align_current(current); acpi_add_table(rsdp, ecdt); printk(BIOS_DEBUG, "current = %lx\n", current); -- cgit v1.2.3