From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org, leif.lindholm@linaro.org,
ryan.harkin@linaro.org
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v2 8/9] ArmPlatformPkg/ArmJunoDxe: simplify ACPI table installation
Date: Fri, 31 Mar 2017 15:14:33 +0100 [thread overview]
Message-ID: <20170331141434.20810-9-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20170331141434.20810-1-ard.biesheuvel@linaro.org>
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>
---
ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 37 +-------------------
1 file changed, 1 insertion(+), 36 deletions(-)
diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 14ff189a3078..2b3cca944cf1 100644
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -405,34 +405,6 @@ OnEndOfDxe (
}
}
-STATIC
-BOOLEAN
-AcpiTableJunoR0Check (
- IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
- )
-{
- return TRUE;
-}
-
-STATIC
-BOOLEAN
-AcpiTableJunoR1Check (
- IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
- )
-{
- return TRUE;
-}
-
-STATIC
-BOOLEAN
-AcpiTableJunoR2Check (
- IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader
- )
-{
- return TRUE;
-}
-
-
EFI_STATUS
EFIAPI
ArmJunoEntryPoint (
@@ -538,14 +510,7 @@ ArmJunoEntryPoint (
//
// Try to install the ACPI Tables
//
- if (JunoRevision == JUNO_REVISION_R0) {
- Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR0Check);
- } else if (JunoRevision == JUNO_REVISION_R1) {
- Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR1Check);
- } else if (JunoRevision == JUNO_REVISION_R2) {
- Status = LocateAndInstallAcpiFromFvConditional (&mJunoAcpiTableFile, AcpiTableJunoR2Check);
- }
-
+ Status = LocateAndInstallAcpiFromFv (&mJunoAcpiTableFile);
ASSERT_EFI_ERROR (Status);
//
--
2.9.3
next prev parent reply other threads:[~2017-03-31 14:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 14:14 [PATCH v2 0/9] ArmPlatformgPkg spring cleaning -- now includes Juno Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 1/9] ArmPlatformPkg/ArmShellCmdRunAxf: remove BdsLib dependency Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 2/9] ArmPlatformPkg/ArmVExpressDxe: remove ARM support Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 3/9] ArmPlatformPkg/ArmVExpressDxe: remove unused cruft from ArmHwDxe Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 4/9] ArmPlatformPkg/ArmVExpressDxe: remove FDT handling Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 5/9] ArmPlatformPkg/ArmJunoDxe: use the generic non-discoverable device support Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 6/9] ArmPlatformPkg/ArmJunoPkg: remove PCI host bridge driver Ard Biesheuvel
2017-03-31 14:14 ` [PATCH v2 7/9] ArmPlatformPkg/ArmJunoDxe: remove BdsLib dependency Ard Biesheuvel
2017-03-31 14:14 ` Ard Biesheuvel [this message]
2017-03-31 14:14 ` [PATCH v2 9/9] ArmPlatformPkg/ArmJunoDxe: remove FDT handling Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170331141434.20810-9-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox