narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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 <mcb30@ipxe.org>
pull/310/head
Michael Brown 2021-02-28 23:59:15 +00:00
parent 0956fb52c4
commit d175936b78
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/acpi.c
View File

@ -259,20 +259,12 @@ static int acpi_sx_zsdt ( userptr_t zsdt, uint32_t signature ) {
*/ */
int acpi_sx ( uint32_t signature ) { int acpi_sx ( uint32_t signature ) {
struct acpi_fadt fadtab; struct acpi_fadt fadtab;
userptr_t rsdt;
userptr_t fadt; userptr_t fadt;
userptr_t dsdt; userptr_t dsdt;
userptr_t ssdt; userptr_t ssdt;
unsigned int i; unsigned int i;
int sx; int sx;
/* Locate RSDT */
rsdt = acpi_find_rsdt();
if ( ! rsdt ) {
DBG ( "RSDT not found\n" );
return -ENOENT;
}
/* Try DSDT first */ /* Try DSDT first */
fadt = acpi_find ( FADT_SIGNATURE, 0 ); fadt = acpi_find ( FADT_SIGNATURE, 0 );
if ( fadt ) { if ( fadt ) {
@ -291,8 +283,8 @@ int acpi_sx ( uint32_t signature ) {
return sx; return sx;
} }
DBGC ( colour, "RSDT %#08lx could not find \\_Sx \"%s\"\n", DBGC ( colour, "ACPI could not find \\_Sx \"%s\"\n",
user_to_phys ( rsdt, 0 ), acpi_name ( signature ) ); acpi_name ( signature ) );
return -ENOENT; return -ENOENT;
} }