ArmPlatformPkg/ArmJunoDxe: simplify ACPI table installation

Having a three way conditional with callbacks would make sense if the
callbacks weren't (a) identical and (b) didn't return TRUE all the
time. So get rid of the kludge.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index f7e33961b4e724f75d9680011428dcef0b0ffb35..da93eb582909def1ac1d28b53014b222b2e1e0cc 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -400,34 +400,6 @@ OnEndOfDxe (
   }\r
 }\r
 \r
-STATIC\r
-BOOLEAN\r
-AcpiTableJunoR0Check (\r
-  IN  EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader\r
-  )\r
-{\r
-  return TRUE;\r
-}\r
-\r
-STATIC\r
-BOOLEAN\r
-AcpiTableJunoR1Check (\r
-  IN  EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader\r
-  )\r
-{\r
-  return TRUE;\r
-}\r
-\r
-STATIC\r
-BOOLEAN\r
-AcpiTableJunoR2Check (\r
-  IN  EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader\r
-  )\r
-{\r
-  return TRUE;\r
-}\r
-\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ArmJunoEntryPoint (\r
@@ -517,14 +489,7 @@ ArmJunoEntryPoint (
   //\r
   // Try to install the ACPI Tables\r
   //\r
-  if (JunoRevision == JUNO_REVISION_R0) {\r
-    Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR0Check);\r
-  } else if (JunoRevision == JUNO_REVISION_R1) {\r
-    Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR1Check);\r
-  } else if (JunoRevision == JUNO_REVISION_R2) {\r
-    Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR2Check);\r
-  }\r
-\r
+  Status = LocateAndInstallAcpiFromFv (&mJunoAcpiTableFile);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r