diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-12-10 17:07:38 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-12-15 20:12:01 +0100 |
| commit | 07a1b281a864e8c2a17e29767a7abf495587b325 (patch) | |
| tree | 6856167e67eeb9c56503efc7ed07204d6846eda9 /src/northbridge | |
| parent | ecd4cfcb8695988d82069df4509b56e39794379e (diff) | |
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>
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/intel/gm45/acpi.c | 5 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/acpi.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c index 21a8cd5102..8990c3b140 100644 --- a/src/northbridge/intel/gm45/acpi.c +++ b/src/northbridge/intel/gm45/acpi.c @@ -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); diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c index eebf99c052..4953144349 100644 --- a/src/northbridge/intel/sandybridge/acpi.c +++ b/src/northbridge/intel/sandybridge/acpi.c @@ -235,7 +235,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(struct device *const dev, unsigned long current, struct acpi_rsdp *const rsdp) @@ -248,10 +247,10 @@ unsigned long northbridge_write_acpi_tables(struct device *const dev, acpi_dmar_t *const dmar = (acpi_dmar_t *)current; acpi_create_dmar(dmar, DMAR_INTR_REMAP, 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); |