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.
- Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2011 - 2021, ARM Ltd. All rights reserved.
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