From 746241f114e851623d2031959a99b06a5102708b Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 4 Sep 2017 19:22:26 +0300 Subject: ACPI S3: Remove conflicting local acpi_get_sleep_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now require EARLY_CBMEM_INIT and romstage_handoff to support HAVE_ACPI_RESUME. Thus acpi_handoff_wakeup() would never call an externally defined acpi_get_sleep_type(). Name _sleep_type() was also inapproriate here, as it referred to hardware-dependent SLP_TYP field of PM1CNT but still returned ACPI_Sx value instead. Change-Id: I8dc130f1e86dd7e96922d546f0ae9713188336cd Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21397 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Subrata Banik --- src/arch/x86/acpi_s3.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/arch/x86/acpi_s3.c') diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index a0a790567e..0a17eadc53 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -30,22 +30,17 @@ /* This is filled with acpi_is_wakeup() call early in ramstage. */ static int acpi_slp_type = -1; -#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) -int acpi_get_sleep_type(void) -{ - if (romstage_handoff_is_resume()) { - printk(BIOS_DEBUG, "S3 Resume.\n"); - return ACPI_S3; - } - printk(BIOS_DEBUG, "Normal boot.\n"); - return ACPI_S0; -} -#endif - static void acpi_handoff_wakeup(void) { - if (acpi_slp_type < 0) - acpi_slp_type = acpi_get_sleep_type(); + if (acpi_slp_type < 0) { + if (romstage_handoff_is_resume()) { + printk(BIOS_DEBUG, "S3 Resume.\n"); + acpi_slp_type = ACPI_S3; + } else { + printk(BIOS_DEBUG, "Normal boot.\n"); + acpi_slp_type = ACPI_S0; + } + } } int acpi_is_wakeup(void) -- cgit v1.2.3