From d175936b78abc2b137a5a1e66ad7cf79b5849058 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 28 Feb 2021 23:59:15 +0000 Subject: [acpi] Eliminate redundant acpi_find_rsdt() in acpi_sx() The result from acpi_find_rsdt() is used only for the debug message. Simplify the debug message and remove the otherwise redundant call to acpi_find_rsdt(). Signed-off-by: Michael Brown --- src/core/acpi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/core/acpi.c b/src/core/acpi.c index 19b708271..75511736d 100644 --- a/src/core/acpi.c +++ b/src/core/acpi.c @@ -259,20 +259,12 @@ static int acpi_sx_zsdt ( userptr_t zsdt, uint32_t signature ) { */ int acpi_sx ( uint32_t signature ) { struct acpi_fadt fadtab; - userptr_t rsdt; userptr_t fadt; userptr_t dsdt; userptr_t ssdt; unsigned int i; int sx; - /* Locate RSDT */ - rsdt = acpi_find_rsdt(); - if ( ! rsdt ) { - DBG ( "RSDT not found\n" ); - return -ENOENT; - } - /* Try DSDT first */ fadt = acpi_find ( FADT_SIGNATURE, 0 ); if ( fadt ) { @@ -291,8 +283,8 @@ int acpi_sx ( uint32_t signature ) { return sx; } - DBGC ( colour, "RSDT %#08lx could not find \\_Sx \"%s\"\n", - user_to_phys ( rsdt, 0 ), acpi_name ( signature ) ); + DBGC ( colour, "ACPI could not find \\_Sx \"%s\"\n", + acpi_name ( signature ) ); return -ENOENT; } -- cgit