tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPlatformPkg: HDLCD and PL111: Update debug ASSERTS 

This change moves some ASSERTs in error handling code
to improve efficiency in DEBUG build. This change also
removes redundant error code returns.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Girish Pathak <girish.pathak@arm.com>
Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Girish Pathak 2017-09-26 21:15:14 +01:00 committed by Leif Lindholm
parent 4257dfaa61
commit 3da4193bb6
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArmPlatformPkg/Library/HdLcd/HdLcd.c
View File

@ -90,8 +90,7 @@ LcdInitialize (
@param[in] ModeNumber Display mode number. @param[in] ModeNumber Display mode number.
@retval EFI_SUCCESS Display mode set successfully. @retval EFI_SUCCESS Display mode set successfully.
@retval EFI_DEVICE_ERROR Reurns an error if display timing @retval !(EFI_SUCCESS) Other errors.
information is not available.
**/ **/
EFI_STATUS EFI_STATUS
LcdSetMode ( LcdSetMode (
@ -122,15 +121,15 @@ LcdSetMode (
&VBackPorch, &VBackPorch,
&VFrontPorch &VFrontPorch
); );
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR; ASSERT_EFI_ERROR (Status);
return Status;
} }
Status = LcdPlatformGetBpp (ModeNumber, &LcdBpp); Status = LcdPlatformGetBpp (ModeNumber, &LcdBpp);
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR; ASSERT_EFI_ERROR (Status);
return Status;
} }
BytesPerPixel = GetBytesPerPixel (LcdBpp); BytesPerPixel = GetBytesPerPixel (LcdBpp);

12
ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.c
View File

@ -75,8 +75,8 @@ LcdInitialize (
@param[in] ModeNumbe Display mode number. @param[in] ModeNumbe Display mode number.
@retval EFI_SUCCESS Display mode set successfuly. @retval EFI_SUCCESS Display mode set successfuly.
@retval EFI_DEVICE_ERROR It returns an error if display timing @retval !(EFI_SUCCESS) Other errors.
information is not available.
**/ **/
EFI_STATUS EFI_STATUS
LcdSetMode ( LcdSetMode (
@ -107,15 +107,15 @@ LcdSetMode (
&VBackPorch, &VBackPorch,
&VFrontPorch &VFrontPorch
); );
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR; ASSERT_EFI_ERROR (Status);
return Status;
} }
Status = LcdPlatformGetBpp (ModeNumber, &LcdBpp); Status = LcdPlatformGetBpp (ModeNumber, &LcdBpp);
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR; ASSERT_EFI_ERROR (Status);
return Status;
} }
// Disable the CLCD_LcdEn bit // Disable the CLCD_LcdEn bit