20 files changed, 15 insertions, 20 deletions

diff --git a/src/mainboard/facebook/fbg1701/fadt.c b/src/mainboard/facebook/fbg1701/fadt.c
index cd15725a98..84365193e5 100644
--- a/src/mainboard/facebook/fbg1701/fadt.c
+++ b/src/mainboard/facebook/fbg1701/fadt.c
@@ -24,7 +24,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 	motherboard_fill_fadt(fadt);
 
 	header->checksum =
diff --git a/src/mainboard/google/auron/fadt.c b/src/mainboard/google/auron/fadt.c
index 653ebb4bf6..d6d3ea0df9 100644
--- a/src/mainboard/google/auron/fadt.c
+++ b/src/mainboard/google/auron/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/google/cyan/fadt.c b/src/mainboard/google/cyan/fadt.c
index ab2db11d9f..901fc82738 100644
--- a/src/mainboard/google/cyan/fadt.c
+++ b/src/mainboard/google/cyan/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/google/jecht/fadt.c b/src/mainboard/google/jecht/fadt.c
index 653ebb4bf6..d6d3ea0df9 100644
--- a/src/mainboard/google/jecht/fadt.c
+++ b/src/mainboard/google/jecht/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/google/rambi/fadt.c b/src/mainboard/google/rambi/fadt.c
index 653ebb4bf6..d6d3ea0df9 100644
--- a/src/mainboard/google/rambi/fadt.c
+++ b/src/mainboard/google/rambi/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/intel/galileo/acpi_tables.c b/src/mainboard/intel/galileo/acpi_tables.c
index 078753076e..6666be3283 100644
--- a/src/mainboard/intel/galileo/acpi_tables.c
+++ b/src/mainboard/intel/galileo/acpi_tables.c
@@ -19,7 +19,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	header->asl_compiler_revision = asl_revision;
 
 	/* Fill in SoC specific values */
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/intel/strago/fadt.c b/src/mainboard/intel/strago/fadt.c
index ab2db11d9f..901fc82738 100644
--- a/src/mainboard/intel/strago/fadt.c
+++ b/src/mainboard/intel/strago/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/intel/wtm2/fadt.c b/src/mainboard/intel/wtm2/fadt.c
index 77231e2b40..6858bc1f5c 100644
--- a/src/mainboard/intel/wtm2/fadt.c
+++ b/src/mainboard/intel/wtm2/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *) fadt, header->length);
 }
diff --git a/src/mainboard/portwell/m107/fadt.c b/src/mainboard/portwell/m107/fadt.c
index cd15725a98..84365193e5 100644
--- a/src/mainboard/portwell/m107/fadt.c
+++ b/src/mainboard/portwell/m107/fadt.c
@@ -24,7 +24,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 	motherboard_fill_fadt(fadt);
 
 	header->checksum =
diff --git a/src/mainboard/protectli/vault_bsw/fadt.c b/src/mainboard/protectli/vault_bsw/fadt.c
index 2a32c7956c..37166c3a9c 100644
--- a/src/mainboard/protectli/vault_bsw/fadt.c
+++ b/src/mainboard/protectli/vault_bsw/fadt.c
@@ -25,7 +25,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (unsigned long)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 	motherboard_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *)fadt, header->length);
diff --git a/src/mainboard/purism/librem_bdw/fadt.c b/src/mainboard/purism/librem_bdw/fadt.c
index b756fb911f..5904f62d7c 100644
--- a/src/mainboard/purism/librem_bdw/fadt.c
+++ b/src/mainboard/purism/librem_bdw/fadt.c
@@ -27,7 +27,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 	fadt->x_dsdt_l = (u32)dsdt;
 	fadt->x_dsdt_h = 0;
 
-	acpi_fill_in_fadt(fadt);
+	acpi_fill_fadt(fadt);
 
 	header->checksum = acpi_checksum((void *)fadt, header->length);
 }
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index f9eb50018b..d008dd8591 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -123,7 +123,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	return current;
 }
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt)
+void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
 	const uint16_t pmbase = ACPI_BASE_ADDRESS;
 
diff --git a/src/soc/intel/baytrail/include/soc/acpi.h b/src/soc/intel/baytrail/include/soc/acpi.h
index 342d6bac8a..fc8f8aba4c 100644
--- a/src/soc/intel/baytrail/include/soc/acpi.h
+++ b/src/soc/intel/baytrail/include/soc/acpi.h
@@ -6,7 +6,6 @@
 #include <acpi/acpi.h>
 #include <soc/nvs.h>
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 void acpi_init_gnvs(global_nvs_t *gnvs);
 
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index e6790a7e1e..0bac42ceb6 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -127,7 +127,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	return current;
 }
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt)
+void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
 	const uint16_t pmbase = ACPI_BASE_ADDRESS;
 
diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h
index 8676dcfaa6..5bff07a0fb 100644
--- a/src/soc/intel/braswell/include/soc/acpi.h
+++ b/src/soc/intel/braswell/include/soc/acpi.h
@@ -7,7 +7,6 @@
 #include <soc/nvs.h>
 
 void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
-void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 void acpi_init_gnvs(global_nvs_t *gnvs);
 void southcluster_inject_dsdt(const struct device *device);
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index 081b08a934..fce2e45ed8 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -179,7 +179,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	return current;
 }
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt)
+void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
 	const uint16_t pmbase = ACPI_BASE_ADDRESS;
 
diff --git a/src/soc/intel/broadwell/include/soc/acpi.h b/src/soc/intel/broadwell/include/soc/acpi.h
index 66ad450ac9..46cc42a8e8 100644
--- a/src/soc/intel/broadwell/include/soc/acpi.h
+++ b/src/soc/intel/broadwell/include/soc/acpi.h
@@ -12,7 +12,6 @@
 #define PSS_LATENCY_TRANSITION		10
 #define PSS_LATENCY_BUSMASTER		10
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 void acpi_init_gnvs(global_nvs_t *gnvs);
 unsigned long northbridge_write_acpi_tables(const struct device *dev,
diff --git a/src/soc/intel/quark/acpi.c b/src/soc/intel/quark/acpi.c
index 364a4f96b2..bf173d9972 100644
--- a/src/soc/intel/quark/acpi.c
+++ b/src/soc/intel/quark/acpi.c
@@ -16,7 +16,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	return current;
 }
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt)
+void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
 	struct device *dev = pcidev_on_root(PCI_DEVICE_NUMBER_QNC_LPC,
 			PCI_FUNCTION_NUMBER_QNC_LPC);
diff --git a/src/soc/intel/quark/include/soc/acpi.h b/src/soc/intel/quark/include/soc/acpi.h
index 36f18ebe16..d40fe81cfa 100644
--- a/src/soc/intel/quark/include/soc/acpi.h
+++ b/src/soc/intel/quark/include/soc/acpi.h
@@ -6,6 +6,5 @@
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 
 #endif /* _SOC_ACPI_H_ */
diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h
index 478f258f8d..3422ece7de 100644
--- a/src/soc/intel/skylake/include/soc/acpi.h
+++ b/src/soc/intel/skylake/include/soc/acpi.h
@@ -12,7 +12,6 @@
 #define PSS_LATENCY_TRANSITION		10
 #define PSS_LATENCY_BUSMASTER		10
 
-void acpi_fill_in_fadt(acpi_fadt_t *fadt);
 unsigned long acpi_madt_irq_overrides(unsigned long current);
 void southbridge_inject_dsdt(const struct device *device);
 unsigned long southbridge_write_acpi_tables(const struct device *device,