Vlv2TbltDevicePkg: fix ASSERT_EFI_ERROR() typos

A number of code locations use

  ASSERT_EFI_ERROR (BooleanExpression)

instead of

  ASSERT (BooleanExpression)

Fix them.

Cc: David Wei <david.wei@intel.com>
Cc: Tim He <tim.he@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: David Wei <david.wei@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>

diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
index da7dce6e13c7fd2ee9b3a4ace4dbabf5f96af325..7c95c107e6008f66277ce297326ee637e6ed5be8 100644 (file)
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
@@ -154,7 +154,7 @@ FvbGetVolumeAttributes (
 {\r
   EFI_FW_VOL_INSTANCE *    FwInstance = NULL;\r
   FwInstance = GetFvbInstance(Instance);\r
-  ASSERT_EFI_ERROR (FwInstance != NULL);\r
+  ASSERT (FwInstance != NULL);\r
 \r
   if ( FwInstance != NULL ) {\r
     return FwInstance->VolumeHeader.Attributes;\r
@@ -208,7 +208,7 @@ FvbGetLbaAddress (
   StartLba  = 0;\r
   Offset    = 0;\r
   BlockMap  = &(FwhInstance->VolumeHeader.BlockMap[0]);\r
-  ASSERT_EFI_ERROR (BlockMap != NULL);\r
+  ASSERT (BlockMap != NULL);\r
 \r
   //\r
   // Parse the blockmap of the FV to find which map entry the Lba belongs to.\r
@@ -512,7 +512,7 @@ FvbSetVolumeAttributes (
   FwhInstance = GetFvbInstance (Instance);\r
 \r
   AttribPtr     = (EFI_FVB_ATTRIBUTES_2 *) & (FwhInstance->VolumeHeader.Attributes);\r
-  ASSERT_EFI_ERROR (AttribPtr != NULL);\r
+  ASSERT (AttribPtr != NULL);\r
 \r
   if ( AttribPtr != NULL) {\r
     OldAttributes = *AttribPtr;\r

diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index e38633b2b3ae6402567f8e18ffed7ae110a0d227..7d740df2fef97d69780fed33c9a767589f51d690 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -69,10 +69,10 @@ ConfigureClockGenerator (
   //\r
   // Verify input arguments\r
   //\r
-  ASSERT_EFI_ERROR (ConfigurationTableLength >= 6);\r
-  ASSERT_EFI_ERROR (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH);\r
-  ASSERT_EFI_ERROR (ClockType < ClockGeneratorMax);\r
-  ASSERT_EFI_ERROR (ConfigurationTable != NULL);\r
+  ASSERT (ConfigurationTableLength >= 6);\r
+  ASSERT (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH);\r
+  ASSERT (ClockType < ClockGeneratorMax);\r
+  ASSERT (ConfigurationTable != NULL);\r
 \r
   //\r
   // Read the clock generator\r

diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
index ebaaf40a165ea4c39ee62bf40dcfb1811c2050c7..9d77e86678fe699ad3c42ac83b694666f811c756 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
@@ -49,7 +49,7 @@ GetPlatformInfoHob (
   //\r
   // PlatformInfo PEIM should provide this HOB data, if not ASSERT and return error.\r
   //\r
-  ASSERT_EFI_ERROR (*PlatformInfoHob != NULL);\r
+  ASSERT (*PlatformInfoHob != NULL);\r
   if (!(*PlatformInfoHob)) {\r
     return EFI_NOT_FOUND;\r
   }\r