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 <evan.lloyd@arm.com>
Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Sami Mujawar 2016-03-03 11:55:20 +00:00 committed by Ard Biesheuvel
parent d519498067
commit b843b3730d
1 changed files with 2 additions and 3 deletions

View File

@ -42,7 +42,6 @@ TimerConstructor (
// Check if the ARM Generic Timer Extension is implemented. // Check if the ARM Generic Timer Extension is implemented.
// //
if (ArmIsArchTimerImplemented ()) { if (ArmIsArchTimerImplemented ()) {
UINTN TimerFreq;
// //
// Check if Architectural Timer frequency is pre-determined by the platform // Check if Architectural Timer frequency is pre-determined by the platform
@ -74,8 +73,8 @@ TimerConstructor (
// mode (if secure extension is supported). // mode (if secure extension is supported).
// If the reset value (0) is returned, just ASSERT. // If the reset value (0) is returned, just ASSERT.
// //
TimerFreq = ArmGenericTimerGetTimerFreq (); ASSERT (ArmGenericTimerGetTimerFreq () != 0);
ASSERT (TimerFreq != 0);
} else { } else {
DEBUG ((EFI_D_ERROR, "ARM Architectural Timer is not available in the CPU, hence this library can not be used.\n")); DEBUG ((EFI_D_ERROR, "ARM Architectural Timer is not available in the CPU, hence this library can not be used.\n"));
ASSERT (0); ASSERT (0);