soc/intel: Refactor fill_acpi_wake()

Change-Id: I7fcc2b36cfe57adf8ae3a6acf8b54e19504202a5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49878
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 3545a9425e..d62960dbe2 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -520,20 +520,15 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
 }
 
 /* Save wake source information for calculating ACPI _SWS values */
-int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0)
+int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint32_t **gpe0)
 {
 	const struct soc_intel_skylake_config *config = config_of_soc();
-	struct chipset_power_state *ps;
 	static uint32_t gpe0_sts[GPE0_REG_MAX];
 	uint32_t pm1_en;
 	uint32_t gpe0_std;
 	int i;
 	const int last_index = GPE0_REG_MAX - 1;
 
-	ps = acpi_get_pm_state();
-	if (ps == NULL)
-		return -1;
-
 	pm1_en = ps->pm1_en;
 	gpe0_std = ps->gpe0_en[3];