From 3f975ee5706619d90cdb61e689b27181d7cc6d84 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 26 May 2021 22:14:18 +0200 Subject: [PATCH] OvmfPkg/XenAcpiPlatformDxe: remove the InstallAcpiTable() helper function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The InstallAcpiTable() helper function buys us nothing. Reduce code complexity by removing the function. This patch is best viewed with "git show -b". Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Philippe Mathieu-Daudé Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122 Signed-off-by: Laszlo Ersek Message-Id: <20210526201446.12554-16-lersek@redhat.com> Reviewed-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daudé --- OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c | 30 +++--------- OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h | 9 ---- OvmfPkg/XenAcpiPlatformDxe/Xen.c | 60 +++++++++++------------ 3 files changed, 36 insertions(+), 63 deletions(-) diff --git a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c index 66dcf88585..daf2bf3f45 100644 --- a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c @@ -14,24 +14,6 @@ #include "AcpiPlatform.h" -EFI_STATUS -EFIAPI -InstallAcpiTable ( - IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol, - IN VOID *AcpiTableBuffer, - IN UINTN AcpiTableBufferSize, - OUT UINTN *TableKey - ) -{ - return AcpiProtocol->InstallAcpiTable ( - AcpiProtocol, - AcpiTableBuffer, - AcpiTableBufferSize, - TableKey - ); -} - - /** Locate the first instance of a protocol. If the protocol requested is an FV protocol, then it will return the first FV that contains the ACPI table @@ -200,12 +182,12 @@ InstallOvmfFvTables ( // // Install ACPI table // - Status = InstallAcpiTable ( - AcpiTable, - CurrentTable, - TableSize, - &TableHandle - ); + Status = AcpiTable->InstallAcpiTable ( + AcpiTable, + CurrentTable, + TableSize, + &TableHandle + ); // // Free memory allocated by ReadSection diff --git a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h index 2959ff0be6..47d9769ed1 100644 --- a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h @@ -12,15 +12,6 @@ #include // EFI_ACPI_TABLE_PROTOCOL -EFI_STATUS -EFIAPI -InstallAcpiTable ( - IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol, - IN VOID *AcpiTableBuffer, - IN UINTN AcpiTableBufferSize, - OUT UINTN *TableKey - ); - EFI_STATUS EFIAPI InstallXenTables ( diff --git a/OvmfPkg/XenAcpiPlatformDxe/Xen.c b/OvmfPkg/XenAcpiPlatformDxe/Xen.c index e8395db548..151376176f 100644 --- a/OvmfPkg/XenAcpiPlatformDxe/Xen.c +++ b/OvmfPkg/XenAcpiPlatformDxe/Xen.c @@ -185,12 +185,12 @@ InstallXenTables ( // // Install the XSDT tables // - Status = InstallAcpiTable ( - AcpiProtocol, - CurrentTable, - CurrentTable->Length, - &TableHandle - ); + Status = AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + CurrentTable, + CurrentTable->Length, + &TableHandle + ); if (EFI_ERROR (Status)) { return Status; @@ -235,12 +235,12 @@ InstallXenTables ( // // Install the RSDT tables // - Status = InstallAcpiTable ( - AcpiProtocol, - CurrentTable, - CurrentTable->Length, - &TableHandle - ); + Status = AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + CurrentTable, + CurrentTable->Length, + &TableHandle + ); if (EFI_ERROR (Status)) { return Status; @@ -266,12 +266,12 @@ InstallXenTables ( // // FACS 2.0 // - Status = InstallAcpiTable ( - AcpiProtocol, - Facs2Table, - Facs2Table->Length, - &TableHandle - ); + Status = AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + Facs2Table, + Facs2Table->Length, + &TableHandle + ); if (EFI_ERROR (Status)) { return Status; } @@ -280,12 +280,12 @@ InstallXenTables ( // // FACS 1.0 // - Status = InstallAcpiTable ( - AcpiProtocol, - Facs1Table, - Facs1Table->Length, - &TableHandle - ); + Status = AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + Facs1Table, + Facs1Table->Length, + &TableHandle + ); if (EFI_ERROR (Status)) { return Status; } @@ -301,12 +301,12 @@ InstallXenTables ( CpuDeadLoop (); } - Status = InstallAcpiTable ( - AcpiProtocol, - DsdtTable, - DsdtTable->Length, - &TableHandle - ); + Status = AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + DsdtTable, + DsdtTable->Length, + &TableHandle + ); if (EFI_ERROR (Status)) { return Status; } -- 2.39.2