ArmPkg: Fix Ecc error 5007 in ArmLib

[mirror_edk2.git] / ArmPkg / Library / ArmLib / ArmLib.c

diff --git a/ArmPkg/Library/ArmLib/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c
index 7e227936fa6fe53dc3f34c79eb77a66e51baedd9..c8622f1794e01d0d717fe2abd50f3662bdebdfc7 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmLib.c
+++ b/ArmPkg/Library/ArmLib/ArmLib.c
@@ -1,23 +1,15 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2021, ARM Ltd. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include <Base.h>\r
 \r
 #include <Library/ArmLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
 \r
 #include "ArmLibPrivate.h"\r
 \r
@@ -27,9 +19,7 @@ ArmSetAuxCrBit (
   IN  UINT32    Bits\r
   )\r
 {\r
-  UINT32 val = ArmReadAuxCr();\r
-  val |= Bits;\r
-  ArmWriteAuxCr(val);\r
+  ArmWriteAuxCr(ArmReadAuxCr() | Bits);\r
 }\r
 \r
 VOID\r
@@ -38,9 +28,7 @@ ArmUnsetAuxCrBit (
   IN  UINT32    Bits\r
   )\r
 {\r
-  UINT32 val = ArmReadAuxCr();\r
-  val &= ~Bits;\r
-  ArmWriteAuxCr(val);\r
+  ArmWriteAuxCr(ArmReadAuxCr() & ~Bits);\r
 }\r
 \r
 //\r
@@ -53,10 +41,7 @@ ArmSetCpuActlrBit (
   IN  UINTN    Bits\r
   )\r
 {\r
-  UINTN Value;\r
-  Value =  ArmReadCpuActlr ();\r
-  Value |= Bits;\r
-  ArmWriteCpuActlr (Value);\r
+  ArmWriteCpuActlr (ArmReadCpuActlr () | Bits);\r
 }\r
 \r
 VOID\r
@@ -65,10 +50,7 @@ ArmUnsetCpuActlrBit (
   IN  UINTN    Bits\r
   )\r
 {\r
-  UINTN Value;\r
-  Value = ArmReadCpuActlr ();\r
-  Value &= ~Bits;\r
-  ArmWriteCpuActlr (Value);\r
+  ArmWriteCpuActlr (ArmReadCpuActlr () & ~Bits);\r
 }\r
 \r
 UINTN\r