From 178dbd4442827d179e5800a19d60c3f5c03583ab Mon Sep 17 00:00:00 2001
From: Pierre Gondois <Pierre.Gondois@arm.com>
Date: Thu, 10 Dec 2020 13:12:00 +0000
Subject: [PATCH] ArmPkg: Fix Ecc error 5007 in ArmLib

This patch fixes the following Ecc reported error:
There should be no initialization of a variable as
part of its declaration

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
---
 ArmPkg/Library/ArmLib/ArmLib.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/ArmPkg/Library/ArmLib/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c
index 3905d02c5e..c8622f1794 100644
--- a/ArmPkg/Library/ArmLib/ArmLib.c
+++ b/ArmPkg/Library/ArmLib/ArmLib.c
@@ -1,7 +1,7 @@
 /** @file
 
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-  Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
+  Copyright (c) 2011 - 2021, ARM Ltd. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -19,9 +19,7 @@ ArmSetAuxCrBit (
   IN  UINT32    Bits
   )
 {
-  UINT32 val = ArmReadAuxCr();
-  val |= Bits;
-  ArmWriteAuxCr(val);
+  ArmWriteAuxCr(ArmReadAuxCr() | Bits);
 }
 
 VOID
@@ -30,9 +28,7 @@ ArmUnsetAuxCrBit (
   IN  UINT32    Bits
   )
 {
-  UINT32 val = ArmReadAuxCr();
-  val &= ~Bits;
-  ArmWriteAuxCr(val);
+  ArmWriteAuxCr(ArmReadAuxCr() & ~Bits);
 }
 
 //
@@ -45,10 +41,7 @@ ArmSetCpuActlrBit (
   IN  UINTN    Bits
   )
 {
-  UINTN Value;
-  Value =  ArmReadCpuActlr ();
-  Value |= Bits;
-  ArmWriteCpuActlr (Value);
+  ArmWriteCpuActlr (ArmReadCpuActlr () | Bits);
 }
 
 VOID
@@ -57,10 +50,7 @@ ArmUnsetCpuActlrBit (
   IN  UINTN    Bits
   )
 {
-  UINTN Value;
-  Value = ArmReadCpuActlr ();
-  Value &= ~Bits;
-  ArmWriteCpuActlr (Value);
+  ArmWriteCpuActlr (ArmReadCpuActlr () & ~Bits);
 }
 
 UINTN
-- 
2.39.2