A number of code locations use ASSERT_EFI_ERROR (BooleanExpression)
instead of ASSERT (BooleanExpression) Fix them. Cc: Michael D Kinney <michael.d.kin...@intel.com> Cc: Kelly Steele <kelly.ste...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Notes: not even build tested QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c | 2 +- QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c | 2 +- QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c | 2 +- QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c index 309eb041ee92..36300efd3146 100644 --- a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c +++ b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c @@ -680,7 +680,7 @@ AcpiPlatformEntryPoint ( // Init Pci Device PRT PRW information structure from PCD // mConfigData = (PCI_DEVICE_SETTING *)AllocateZeroPool (sizeof (PCI_DEVICE_SETTING)); - ASSERT_EFI_ERROR (mConfigData); + ASSERT (mConfigData != NULL); InitPciDeviceInfoStructure (mConfigData); // // Get the Acpi SDT protocol for manipulation on acpi table diff --git a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c index 11781e03f4c5..98035bedd58f 100644 --- a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c +++ b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c @@ -218,7 +218,7 @@ MadtTableInitialize ( //ASSERT (NumberOfCPUs <= 2 && NumberOfCPUs > 0); MadtSize = GetAcutalMadtTableSize (&MadtConfigData, NumberOfCPUs); Madt = (EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)AllocateZeroPool (MadtSize); - ASSERT_EFI_ERROR (Madt); + ASSERT (Madt != NULL); // // Initialize MADT Header information // diff --git a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c index 441f7609a536..39185bc0d5ff 100644 --- a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c +++ b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c @@ -174,7 +174,7 @@ PlatformFlashLockConfig ( // SpiProtocol = LocateSpiProtocol (NULL); // This routine will not be called in SMM. - ASSERT_EFI_ERROR (SpiProtocol != NULL); + ASSERT (SpiProtocol != NULL); if (SpiProtocol != NULL) { Status = SpiProtocol->Lock (SpiProtocol); diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c index df6c1cc23240..6b07d7829328 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c @@ -1034,7 +1034,7 @@ InstallS3Memory ( // memory above 1MB. So Memory Callback can set cache for the system memory // correctly on S3 boot path, just like it does on Normal boot path. // - ASSERT_EFI_ERROR ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0); + ASSERT ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0); BuildResourceDescriptorHob ( EFI_RESOURCE_SYSTEM_MEMORY, ( -- 1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel