[coreboot-gerrit] Change in coreboot[master]: arch/x86: Remove acpi_fail_wakeup() and cbmem_fail_resume()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35389 )

Change subject: arch/x86: Remove acpi_fail_wakeup() and cbmem_fail_resume()
......................................................................

arch/x86: Remove acpi_fail_wakeup() and cbmem_fail_resume()

Unused since commit d46b8d5.

Change-Id: If0f1e0381dd7698f842dc1288ff222a4d5d4783c
Signed-off-by: Kyösti Mälkki 
---
M src/arch/x86/acpi_s3.c
M src/arch/x86/cbmem.c
M src/arch/x86/include/arch/acpi.h
M src/include/cbmem.h
M src/lib/cbmem_common.c
5 files changed, 0 insertions(+), 23 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/35389/1

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 5553b2cc..52f8a20 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -60,12 +60,6 @@
    acpi_handoff_wakeup();
    return (acpi_slp_type == ACPI_S4);
 }
-
-void acpi_fail_wakeup(void)
-{
-	if (acpi_slp_type == ACPI_S3 || acpi_slp_type == ACPI_S2)
-		acpi_slp_type = ACPI_S0;
-}
 #endif /* ENV_RAMSTAGE */

#define WAKEUP_BASE 0x600
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index 648633f..16c35b5 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -13,7 +13,6 @@

#include <stdlib.h>
 #include <cbmem.h>
-#include <arch/acpi.h>

#if CONFIG(CBMEM_TOP_BACKUP)

@@ -35,13 +34,3 @@
 }

#endif /* CBMEM_TOP_BACKUP */
-
-/* Something went wrong, our high memory area got wiped */
-void cbmem_fail_resume(void)
-{
-#if !defined(__PRE_RAM__) && CONFIG(HAVE_ACPI_RESUME)
-	/* ACPI resume needs to be cleared in the fail-to-recover case, but that
-	 * condition is only handled during ramstage. */
-	acpi_fail_wakeup();
-#endif
-}
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 14f0cdf..42e45fb 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -932,7 +932,6 @@
    acpi_hest_esd_t *esd, u16 type, void *data, u16 len);

/* For ACPI S3 support. */
-void acpi_fail_wakeup(void);
 void acpi_resume(void *wake_vec);
 void mainboard_suspend_resume(void);
 void *acpi_find_wakeup_vector(void);
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index f3df21d..f972ba6 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -106,7 +106,6 @@
 /* Indicate to each hook if cbmem is being recovered or not. */
 typedef void (* const cbmem_init_hook_t)(int is_recovery);
 void cbmem_run_init_hooks(int is_recovery);
-void cbmem_fail_resume(void);

/* Ramstage only functions. */
 /* Add the cbmem memory used to the memory map at boot. */
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index d86edf0..b018acb 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -32,7 +32,3 @@
    	init_hook_ptr++;
    }
 }
-
-void __weak cbmem_fail_resume(void)
-{
-}