commit a4beaaffedb53f6d8bcc199aedaddc9f5c3eec7c
author Soby Mathew <soby.mathew@arm.com> Thu Jul 07 10:03:21 2016 +0100
committer Soby Mathew <soby.mathew@arm.com> Tue Jul 19 10:19:08 2016 +0100
tree ea4b3014b3cd194cb5b2e7a8e8d9824cdcb1d8c6
parent 48ac1df9460a046f925545bc1c94d93bd3506509

Define `plat_get_syscnt_freq2()` unconditionally for ARM platforms

Previously the definition of `plat_get_syscnt_freq2()` in `arm_common.c` was
conditionally defined based on the ERROR_DEPRECATED flag. This patch makes
this function available irrespective of the flag and removes the deprecated
`plat_get_syscnt_freq()` definition.

Change-Id: I250ca787ca1b5e867096c6ba8f2bb444db44c97b

plat/arm/common/arm_common.c

diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c
index 03e44f4..93355fe 100644
--- a/plat/arm/common/arm_common.c
+++ b/plat/arm/common/arm_common.c
@@ -46,8 +46,6 @@
  * conflicts with the definition in plat/common. */
 #if ERROR_DEPRECATED
 #pragma weak plat_get_syscnt_freq2
-#else
-#pragma weak plat_get_syscnt_freq
 #endif
 
 /*
@@ -187,15 +185,9 @@
 
 #ifdef ARM_SYS_CNTCTL_BASE
 
-#if ERROR_DEPRECATED
 unsigned int plat_get_syscnt_freq2(void)
 {
 	unsigned int counter_base_frequency;
-#else
-unsigned long long plat_get_syscnt_freq(void)
-{
-	unsigned long long counter_base_frequency;
-#endif /* ERROR_DEPRECATED */
 
 	/* Read the frequency from Frequency modes table */
 	counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF);