OvmfPkg/XenAcpiPlatformDxe: remove the InstallAcpiTable() helper function

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 <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-16-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c
index 66dcf885859e2a14ad738c4f48fbb6211fd11284..daf2bf3f458a4241ff63e6a5179b0b8a63625390 100644 (file)
--- a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c
+++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c
@@ -14,24 +14,6 @@
 \r
 #include "AcpiPlatform.h"\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-InstallAcpiTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
-  )\r
-{\r
-  return AcpiProtocol->InstallAcpiTable (\r
-                         AcpiProtocol,\r
-                         AcpiTableBuffer,\r
-                         AcpiTableBufferSize,\r
-                         TableKey\r
-                         );\r
-}\r
-\r
-\r
 /**\r
   Locate the first instance of a protocol.  If the protocol requested is an\r
   FV protocol, then it will return the first FV that contains the ACPI table\r
@@ -200,12 +182,12 @@ InstallOvmfFvTables (
       //\r
       // Install ACPI table\r
       //\r
-      Status = InstallAcpiTable (\r
-                 AcpiTable,\r
-                 CurrentTable,\r
-                 TableSize,\r
-                 &TableHandle\r
-                 );\r
+      Status = AcpiTable->InstallAcpiTable (\r
+                            AcpiTable,\r
+                            CurrentTable,\r
+                            TableSize,\r
+                            &TableHandle\r
+                            );\r
 \r
       //\r
       // Free memory allocated by ReadSection\r

diff --git a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h
index 2959ff0be6cf857b85e796843a8a09e887eadf80..47d9769ed12b1db386523d7e91a6af04f84f84e7 100644 (file)
--- a/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h
+++ b/OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h
@@ -12,15 +12,6 @@
 \r
 #include <Protocol/AcpiTable.h> // EFI_ACPI_TABLE_PROTOCOL\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-InstallAcpiTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
-  );\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 InstallXenTables (\r

diff --git a/OvmfPkg/XenAcpiPlatformDxe/Xen.c b/OvmfPkg/XenAcpiPlatformDxe/Xen.c
index e8395db548d91dafab438e2d0995d7a1af80f03b..151376176f7d99282a3324502297919a75265396 100644 (file)
--- a/OvmfPkg/XenAcpiPlatformDxe/Xen.c
+++ b/OvmfPkg/XenAcpiPlatformDxe/Xen.c
@@ -185,12 +185,12 @@ InstallXenTables (
       //\r
       // Install the XSDT tables\r
       //\r
-      Status = InstallAcpiTable (\r
-                 AcpiProtocol,\r
-                 CurrentTable,\r
-                 CurrentTable->Length,\r
-                 &TableHandle\r
-                 );\r
+      Status = AcpiProtocol->InstallAcpiTable (\r
+                               AcpiProtocol,\r
+                               CurrentTable,\r
+                               CurrentTable->Length,\r
+                               &TableHandle\r
+                               );\r
 \r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
@@ -235,12 +235,12 @@ InstallXenTables (
       //\r
       // Install the RSDT tables\r
       //\r
-      Status = InstallAcpiTable (\r
-                 AcpiProtocol,\r
-                 CurrentTable,\r
-                 CurrentTable->Length,\r
-                 &TableHandle\r
-                 );\r
+      Status = AcpiProtocol->InstallAcpiTable (\r
+                               AcpiProtocol,\r
+                               CurrentTable,\r
+                               CurrentTable->Length,\r
+                               &TableHandle\r
+                               );\r
 \r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
@@ -266,12 +266,12 @@ InstallXenTables (
     //\r
     // FACS 2.0\r
     //\r
-    Status = InstallAcpiTable (\r
-               AcpiProtocol,\r
-               Facs2Table,\r
-               Facs2Table->Length,\r
-               &TableHandle\r
-               );\r
+    Status = AcpiProtocol->InstallAcpiTable (\r
+                             AcpiProtocol,\r
+                             Facs2Table,\r
+                             Facs2Table->Length,\r
+                             &TableHandle\r
+                             );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -280,12 +280,12 @@ InstallXenTables (
     //\r
     // FACS 1.0\r
     //\r
-    Status = InstallAcpiTable (\r
-               AcpiProtocol,\r
-               Facs1Table,\r
-               Facs1Table->Length,\r
-               &TableHandle\r
-               );\r
+    Status = AcpiProtocol->InstallAcpiTable (\r
+                             AcpiProtocol,\r
+                             Facs1Table,\r
+                             Facs1Table->Length,\r
+                             &TableHandle\r
+                             );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -301,12 +301,12 @@ InstallXenTables (
     CpuDeadLoop ();\r
   }\r
 \r
-  Status = InstallAcpiTable (\r
-             AcpiProtocol,\r
-             DsdtTable,\r
-             DsdtTable->Length,\r
-             &TableHandle\r
-             );\r
+  Status = AcpiProtocol->InstallAcpiTable (\r
+                           AcpiProtocol,\r
+                           DsdtTable,\r
+                           DsdtTable->Length,\r
+                           &TableHandle\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r