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/southbridge/intel/lynxpoint/lpc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/southbridge/intel/lynxpoint/lpc.c') diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 93bd25133d..f4c3826aa9 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -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; -- cgit v1.2.3