aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2021-02-28 23:59:15 +0000
committerMichael Brown <mcb30@ipxe.org>2021-02-28 23:59:15 +0000
commitd175936b78abc2b137a5a1e66ad7cf79b5849058 (patch)
treebf735c518e019af9f45000db6291c0f707f9f82f
parent0956fb52c4d435701749bf2eff0d1b171361e0f1 (diff)
downloadipxe-d175936b78abc2b137a5a1e66ad7cf79b5849058.zip
ipxe-d175936b78abc2b137a5a1e66ad7cf79b5849058.tar.gz
ipxe-d175936b78abc2b137a5a1e66ad7cf79b5849058.tar.bz2
[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>
-rw-r--r--src/core/acpi.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/core/acpi.c b/src/core/acpi.c
index 19b7082..7551173 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;
}