Refactor some alignment handling

Made using coccinelle:
  @@
  expression E;
  @@
  -(E + 7) & -8
  +ALIGN(E, 8)

  @@
  expression E;
  @@
  -(E + 15) & -16
  +ALIGN(E, 16)

Change-Id: I071d2c98cd95580d7de21d256c31b6368a3dc70b
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/910
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index 2e04c57352..9c432528ee 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -143,7 +143,7 @@ unsigned long write_acpi_tables(unsigned long start)
   get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */
 
   /* Align ACPI tables to 16 bytes */
-  start = (start + 0x0f) & -0x10;
+  start = ALIGN(start, 16);
   current = start;
 
   printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
@@ -173,7 +173,7 @@ unsigned long write_acpi_tables(unsigned long start)
 #endif
 
   /* If we want to use HPET Timers Linux wants an MADT */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI:    * MADT at %lx\n",current);
   madt = (acpi_madt_t *) current;
   acpi_create_madt(madt);
@@ -181,14 +181,14 @@ unsigned long write_acpi_tables(unsigned long start)
   acpi_add_table(rsdp, madt);
 
   /* HEST */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   hest = (acpi_hest_t *)current;
   acpi_write_hest((void *)current);
   acpi_add_table(rsdp, (void *)current);
   current += ((acpi_header_t *)current)->length;
 
   /* SRAT */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI:    * SRAT at %lx\n", current);
   srat = (acpi_srat_t *) agesawrapper_getlateinitptr (PICK_SRAT);
   if (srat != NULL) {
@@ -200,7 +200,7 @@ unsigned long write_acpi_tables(unsigned long start)
   }
 
   /* SLIT */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI:   * SLIT at %lx\n", current);
   slit = (acpi_slit_t *) agesawrapper_getlateinitptr (PICK_SLIT);
   if (slit != NULL) {
@@ -212,7 +212,7 @@ unsigned long write_acpi_tables(unsigned long start)
   }
 
   /* SSDT */
-  current = (current + 0x0f) & -0x10;
+  current = ALIGN(current, 16);
   printk(BIOS_DEBUG, "ACPI:    * SSDT at %lx\n", current);
   ssdt = (acpi_header_t *)agesawrapper_getlateinitptr (PICK_PSTATE);
   if (ssdt != NULL) {
@@ -234,7 +234,7 @@ unsigned long write_acpi_tables(unsigned long start)
   printk(BIOS_DEBUG, "ACPI:    * SSDT for PState at %lx\n", current);
 
   /* DSDT */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI:    * DSDT at %lx\n", current);
   dsdt = (acpi_header_t *)current; // it will used by fadt
   memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
@@ -243,14 +243,14 @@ unsigned long write_acpi_tables(unsigned long start)
   printk(BIOS_DEBUG, "ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
   /* FACS */ // it needs 64 bit alignment
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI: * FACS at %lx\n", current);
   facs = (acpi_facs_t *) current; // it will be used by fadt
   current += sizeof(acpi_facs_t);
   acpi_create_facs(facs);
 
   /* FADT */
-  current = (current + 0x07) & -0x08;
+  current = ALIGN(current, 8);
   printk(BIOS_DEBUG, "ACPI:    * FADT at %lx\n", current);
   fadt = (acpi_fadt_t *) current;
   current += sizeof(acpi_fadt_t);