summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c6
-rw-r--r--Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c8
-rw-r--r--Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
index da7dce6e13..7c95c107e6 100644
--- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
+++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c
@@ -154,7 +154,7 @@ FvbGetVolumeAttributes (
{
EFI_FW_VOL_INSTANCE * FwInstance = NULL;
FwInstance = GetFvbInstance(Instance);
- ASSERT_EFI_ERROR (FwInstance != NULL);
+ ASSERT (FwInstance != NULL);
if ( FwInstance != NULL ) {
return FwInstance->VolumeHeader.Attributes;
@@ -208,7 +208,7 @@ FvbGetLbaAddress (
StartLba = 0;
Offset = 0;
BlockMap = &(FwhInstance->VolumeHeader.BlockMap[0]);
- ASSERT_EFI_ERROR (BlockMap != NULL);
+ ASSERT (BlockMap != NULL);
//
// Parse the blockmap of the FV to find which map entry the Lba belongs to.
@@ -512,7 +512,7 @@ FvbSetVolumeAttributes (
FwhInstance = GetFvbInstance (Instance);
AttribPtr = (EFI_FVB_ATTRIBUTES_2 *) & (FwhInstance->VolumeHeader.Attributes);
- ASSERT_EFI_ERROR (AttribPtr != NULL);
+ ASSERT (AttribPtr != NULL);
if ( AttribPtr != NULL) {
OldAttributes = *AttribPtr;
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index e38633b2b3..7d740df2fe 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -69,10 +69,10 @@ ConfigureClockGenerator (
//
// Verify input arguments
//
- ASSERT_EFI_ERROR (ConfigurationTableLength >= 6);
- ASSERT_EFI_ERROR (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH);
- ASSERT_EFI_ERROR (ClockType < ClockGeneratorMax);
- ASSERT_EFI_ERROR (ConfigurationTable != NULL);
+ ASSERT (ConfigurationTableLength >= 6);
+ ASSERT (ConfigurationTableLength <= MAX_CLOCK_GENERATOR_BUFFER_LENGTH);
+ ASSERT (ClockType < ClockGeneratorMax);
+ ASSERT (ConfigurationTable != NULL);
//
// Read the clock generator
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
index ebaaf40a16..9d77e86678 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/PlatformInfoHob.c
@@ -49,7 +49,7 @@ GetPlatformInfoHob (
//
// PlatformInfo PEIM should provide this HOB data, if not ASSERT and return error.
//
- ASSERT_EFI_ERROR (*PlatformInfoHob != NULL);
+ ASSERT (*PlatformInfoHob != NULL);
if (!(*PlatformInfoHob)) {
return EFI_NOT_FOUND;
}