QuarkPlatformPkg: fix ASSERT_EFI_ERROR() typos

A number of code locations use

  ASSERT_EFI_ERROR (BooleanExpression)

instead of

  ASSERT (BooleanExpression)

Fix them.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>

diff --git a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/AcpiPlatform.c
index 309eb041ee92ce8d6638bf03f5886b04a0d18841..36300efd3146fb8c0a5276bcd030b09de1fca6c3 100644 (file)
--- 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\r
   //\r
   mConfigData = (PCI_DEVICE_SETTING *)AllocateZeroPool (sizeof (PCI_DEVICE_SETTING));\r
-  ASSERT_EFI_ERROR (mConfigData);\r
+  ASSERT (mConfigData != NULL);\r
   InitPciDeviceInfoStructure (mConfigData);\r
   //\r
   // Get the Acpi SDT protocol for manipulation on acpi table\r

diff --git a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c
index 11781e03f4c595eadd8de58bd0813044937af0ea..98035bedd58f4ee369351ccf0c13a07b04ba3911 100644 (file)
--- a/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c
+++ b/QuarkPlatformPkg/Acpi/Dxe/AcpiPlatform/MadtPlatform.c
@@ -218,7 +218,7 @@ MadtTableInitialize (
   //ASSERT (NumberOfCPUs <= 2 && NumberOfCPUs > 0);\r
   MadtSize = GetAcutalMadtTableSize (&MadtConfigData, NumberOfCPUs);\r
   Madt = (EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)AllocateZeroPool (MadtSize);\r
-  ASSERT_EFI_ERROR (Madt);\r
+  ASSERT (Madt != NULL);\r
   //\r
   // Initialize MADT Header information\r
   //\r

diff --git a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c
index 441f7609a536462e41c6c9c869d6c877e4d72a91..39185bc0d5ffb97a2e762c10576b0231f3e8ce8b 100644 (file)
--- a/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c
+++ b/QuarkPlatformPkg/Library/PlatformHelperLib/PlatformHelperDxe.c
@@ -174,7 +174,7 @@ PlatformFlashLockConfig (
   //\r
 \r
   SpiProtocol = LocateSpiProtocol (NULL);  // This routine will not be called in SMM.\r
-  ASSERT_EFI_ERROR (SpiProtocol != NULL);\r
+  ASSERT (SpiProtocol != NULL);\r
   if (SpiProtocol != NULL) {\r
     Status = SpiProtocol->Lock (SpiProtocol);\r
 \r

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c
index df6c1cc23240cff55c61ec3ba72833b7487baf94..6b07d7829328b5abed4d47679ece7b3f9585d7e1 100644 (file)
--- 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\r
   // correctly on S3 boot path, just like it does on Normal boot path.\r
   //\r
-  ASSERT_EFI_ERROR ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0);\r
+  ASSERT ((S3MemoryRangeData->SystemMemoryLength - 0x100000) > 0);\r
   BuildResourceDescriptorHob (\r
             EFI_RESOURCE_SYSTEM_MEMORY,\r
             (\r