From fe3e4e2ae214f0bef0e6bb24c7675ba5528a77b4 Mon Sep 17 00:00:00 2001 From: Girish Pathak Date: Tue, 26 Sep 2017 21:15:15 +0100 Subject: ARM/VExpressPkg: PL111Lcd/HdLcd plaform libs: Minor code cleanup This minor change removes some unecessary initializations and variables in PL111LcdArmVExpress.c and redudant return status checks in HdLcdArmVExpress.c Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Girish Pathak Signed-off-by: Evan Lloyd Reviewed-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- .../Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c | 5 +---- .../Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c | 16 ++++------------ 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'Platform') diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c index 5247b8e038..6fe7360d55 100644 --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c @@ -259,10 +259,7 @@ LcdPlatformSetMode ( SYS_CFG_MUXFPGA, ARM_VE_DAUGHTERBOARD_1_SITE ); - if (EFI_ERROR (Status)) { - ASSERT_EFI_ERROR (Status); - return Status; - } + ASSERT_EFI_ERROR (Status); return Status; } diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c index 3d2ec7b1bf..c229530ce8 100644 --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c @@ -203,8 +203,6 @@ LcdPlatformGetVram ( { EFI_STATUS Status; - Status = EFI_SUCCESS; - ASSERT (VramBaseAddress != NULL); ASSERT (VramSize != NULL); @@ -214,6 +212,7 @@ LcdPlatformGetVram ( case ARM_VE_MOTHERBOARD_SITE: *VramBaseAddress = (EFI_PHYSICAL_ADDRESS)PL111_CLCD_VRAM_MOTHERBOARD_BASE; *VramSize = LCD_VRAM_SIZE; + Status = EFI_SUCCESS; break; case ARM_VE_DAUGHTERBOARD_1_SITE: @@ -242,7 +241,6 @@ LcdPlatformGetVram ( if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status); gBS->FreePages (*VramBaseAddress, EFI_SIZE_TO_PAGES (*VramSize)); - return Status; } break; @@ -292,7 +290,6 @@ LcdPlatformSetMode ( ) { EFI_STATUS Status; - UINT32 LcdSite; UINT32 OscillatorId; SYS_CONFIG_FUNCTION Function; UINT32 SysId; @@ -302,9 +299,7 @@ LcdPlatformSetMode ( return EFI_INVALID_PARAMETER; } - LcdSite = PL111_CLCD_SITE; - - switch (LcdSite) { + switch (PL111_CLCD_SITE) { case ARM_VE_MOTHERBOARD_SITE: Function = SYS_CFG_OSC; OscillatorId = PL111_CLCD_MOTHERBOARD_VIDEO_MODE_OSC_ID; @@ -349,11 +344,8 @@ LcdPlatformSetMode ( } // Set the multiplexer - Status = ArmPlatformSysConfigSet (SYS_CFG_MUXFPGA, LcdSite); - if (EFI_ERROR (Status)) { - ASSERT_EFI_ERROR (Status); - return Status; - } + Status = ArmPlatformSysConfigSet (SYS_CFG_MUXFPGA, PL111_CLCD_SITE); + ASSERT_EFI_ERROR (Status); return Status; } -- cgit v1.2.3