Re: [edk2] [PATCH edk2-platforms v2 07/18] ARM/VExpressPkg: PL111LcdArmVExpressLib: Minor code cleanup

2017-12-23 Thread Ard Biesheuvel
On 22 December 2017 at 19:08,   wrote:
> From: Girish Pathak 
>
> This minor change removes some unecessary initializations and variables
> in PL111LcdArmVExpress.c
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Girish Pathak 
> Signed-off-by: Evan Lloyd 

Reviewed-by: Ard Biesheuvel 

> ---
>  
> Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c 
> | 16 
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git 
> a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
>  
> b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
> index 
> fd4eea8f8e2397bc7d4ddf4cfe3dcc97a5109edb..11335bb2cef9d7ca2606d4a8671382bf3dc2d254
>  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 (FALSE);
>gBS->FreePages (*VramBaseAddress, EFI_SIZE_TO_PAGES (*VramSize));
> -  return Status;
>  }
>  break;
>
> @@ -292,7 +290,6 @@ LcdPlatformSetMode (
>)
>  {
>EFI_STATUSStatus;
> -  UINT32LcdSite;
>UINT32OscillatorId;
>SYS_CONFIG_FUNCTION   Function;
>UINT32SysId;
> @@ -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;
>  }
> --
> Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
>
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel


[edk2] [PATCH edk2-platforms v2 07/18] ARM/VExpressPkg: PL111LcdArmVExpressLib: Minor code cleanup

2017-12-22 Thread evan . lloyd
From: Girish Pathak 

This minor change removes some unecessary initializations and variables
in PL111LcdArmVExpress.c

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Girish Pathak 
Signed-off-by: Evan Lloyd 
---
 Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c 
| 16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git 
a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c 
b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
index 
fd4eea8f8e2397bc7d4ddf4cfe3dcc97a5109edb..11335bb2cef9d7ca2606d4a8671382bf3dc2d254
 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 (FALSE);
   gBS->FreePages (*VramBaseAddress, EFI_SIZE_TO_PAGES (*VramSize));
-  return Status;
 }
 break;
 
@@ -292,7 +290,6 @@ LcdPlatformSetMode (
   )
 {
   EFI_STATUSStatus;
-  UINT32LcdSite;
   UINT32OscillatorId;
   SYS_CONFIG_FUNCTION   Function;
   UINT32SysId;
@@ -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;
 }
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel