3 files changed, 2 insertions, 5 deletions
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 36b5bb4017..4892656b89 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -542,8 +542,7 @@ unsigned long southcluster_write_acpi_tables(device_t device,
 					     struct acpi_rsdp *rsdp)
 {
 	current = acpi_write_hpet(device, current, rsdp);
-	ALIGN_CURRENT;
-	return current;
+	return acpi_align_current(current);
 }
 
 void southcluster_inject_dsdt(device_t device)
diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c
index f92917690e..9268c095f5 100644
--- a/src/soc/intel/skylake/igd.c
+++ b/src/soc/intel/skylake/igd.c
@@ -177,7 +177,7 @@ static unsigned long write_acpi_igd_opregion(device_t device,
 	opregion = (igd_opregion_t *)current;
 	init_igd_opregion(opregion);
 	current += sizeof(igd_opregion_t);
-	ALIGN_CURRENT;
+	current = acpi_align_current(current);
 
 	printk(BIOS_DEBUG, "current = %lx\n", current);
 	return current;
diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h
index 08408f9d2c..77e87267f1 100644
--- a/src/soc/intel/skylake/include/soc/acpi.h
+++ b/src/soc/intel/skylake/include/soc/acpi.h
@@ -26,8 +26,6 @@
 #define PSS_LATENCY_TRANSITION		10
 #define PSS_LATENCY_BUSMASTER		10
 
-#define ALIGN_CURRENT current = (ALIGN(current, 16))
-
 void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 void acpi_mainboard_gnvs(global_nvs_t *gnvs);