From b843b3730d69619e1e69b717ce97065a88b54611 Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Thu, 3 Mar 2016 11:55:20 +0000 Subject: [PATCH] ArmPkg/ArmArchTimerLib: fix unused variable in RELEASE builds The TimerFreq variable in the TimerConstructor() is unused in RELEASE builds since ASSERTs are then disabled. The only use of the variable (in the ASSERT) is replaced by a direct invocation of the function previously used to set it. NOTE: The build tools suppress warnings of this using compiler options eg. -Wno-unused-but-set-variable for GCC toolchain or --diag_suppress=550 for RVCT toolchain. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Evan Lloyd Reviewed-by: Ryan Harkin Reviewed-by: Ard Biesheuvel --- ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c index 1be90c515c..e6751b29d9 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c @@ -42,7 +42,6 @@ TimerConstructor ( // Check if the ARM Generic Timer Extension is implemented. // if (ArmIsArchTimerImplemented ()) { - UINTN TimerFreq; // // Check if Architectural Timer frequency is pre-determined by the platform @@ -74,8 +73,8 @@ TimerConstructor ( // mode (if secure extension is supported). // If the reset value (0) is returned, just ASSERT. // - TimerFreq = ArmGenericTimerGetTimerFreq (); - ASSERT (TimerFreq != 0); + ASSERT (ArmGenericTimerGetTimerFreq () != 0); + } else { DEBUG ((EFI_D_ERROR, "ARM Architectural Timer is not available in the CPU, hence this library can not be used.\n")); ASSERT (0);