[coreboot-gerrit] Change in coreboot[master]: ACPI S3: Minor cleanup

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

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

Change subject: ACPI S3: Minor cleanup
......................................................................

ACPI S3: Minor cleanup

Drop extra function in the middle and adjust the post_code()
to happen wright before jump to wakeup vector.

Change-Id: I951c3292f5dbf52a58471da9de94b0c4f4ca7c20
Signed-off-by: Kyösti Mälkki 
---
M src/arch/x86/acpi_s3.c
1 file changed, 8 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/42613/1

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index fef04ac..814719a 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -56,18 +56,6 @@
 extern unsigned char __wakeup;
 extern unsigned int __wakeup_size;

-static void acpi_jump_to_wakeup(void *vector)
-{
-	/* Copy wakeup trampoline in place. */
-	memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size);
-
-	set_boot_successful();
-
-	timestamp_add_now(TS_ACPI_WAKE_JUMP);
-
-	acpi_do_wakeup((uintptr_t)vector);
-}
-
 void __weak mainboard_suspend_resume(void)
 {
 }
@@ -88,8 +76,15 @@
    /* Call mainboard resume handler first, if defined. */
    mainboard_suspend_resume();

+	/* Copy wakeup trampoline in place. */
+	memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size);
+
+	set_boot_successful();
+
+	timestamp_add_now(TS_ACPI_WAKE_JUMP);
+
    post_code(POST_OS_RESUME);
-	acpi_jump_to_wakeup(wake_vec);
+	acpi_do_wakeup((uintptr_t)wake_vec);

die("Failed the jump to wakeup vector\n");
 }