From 072d436b3f72c788b4ec63e31ba75c832ff81c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 17 Jun 2016 08:44:40 +0300 Subject: [PATCH] ACPI S3: Cleanup RSDP reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Variable name shadows parameter name used on other functions, and it can be local anyway after function removal. Change-Id: I3164b15b33d877fef139f48ab2091e60e3124c3b Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/15240 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Nico Huber --- src/arch/x86/acpi.c | 10 +--------- src/arch/x86/include/arch/acpi.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 5640ad0654..cc6d2ad55e 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -1071,24 +1071,16 @@ static acpi_rsdp_t *valid_rsdp(acpi_rsdp_t *rsdp) return rsdp; } -static acpi_rsdp_t *rsdp; - -void *acpi_get_wakeup_rsdp(void) -{ - return rsdp; -} - void *acpi_find_wakeup_vector(void) { char *p, *end; acpi_rsdt_t *rsdt; acpi_facs_t *facs; acpi_fadt_t *fadt = NULL; + acpi_rsdp_t *rsdp = NULL; void *wake_vec; int i; - rsdp = NULL; - if (!acpi_is_wakeup()) return NULL; diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 5674c3a240..30c888cd9c 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -614,7 +614,6 @@ void acpi_resume(void *wake_vec); void acpi_prepare_resume_backup(void); void mainboard_suspend_resume(void); void *acpi_find_wakeup_vector(void); -void *acpi_get_wakeup_rsdp(void); void acpi_jump_to_wakeup(void *wakeup_addr); /* Returns 0 = S0, 1 = S1 ... */