diff mbox series

[06/24] time: Tidy up some unnecessary #ifdefs

Message ID 20230115211602.1127661-7-sjg@chromium.org
State Accepted
Commit 64d445a3b7018dac5131cba9f5d308c64a45e95f
Delegated to: Tom Rini
Headers show
Series trace: Update the trace feature to work with trace-cmd | expand

Commit Message

Simon Glass Jan. 15, 2023, 9:15 p.m. UTC 
Avoid using the preprocessor with TIMER_EARLY.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 lib/time.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/lib/time.c b/lib/time.c
index 0c95d12f614..1ef58f92cd1 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -70,15 +70,14 @@  extern unsigned long timer_read_counter(void);
 ulong notrace get_tbclk(void)
 {
 	if (!gd->timer) {
-#ifdef CONFIG_TIMER_EARLY
-		return timer_early_get_rate();
-#else
 		int ret;
 
+		if (IS_ENABLED(CONFIG_TIMER_EARLY))
+			return timer_early_get_rate();
+
 		ret = dm_timer_init();
 		if (ret)
 			return ret;
-#endif
 	}
 
 	return timer_get_rate(gd->timer);
@@ -90,15 +89,14 @@  uint64_t notrace get_ticks(void)
 	int ret;
 
 	if (!gd->timer) {
-#ifdef CONFIG_TIMER_EARLY
-		return timer_early_get_count();
-#else
 		int ret;
 
+		if (IS_ENABLED(CONFIG_TIMER_EARLY))
+			return timer_early_get_count();
+
 		ret = dm_timer_init();
 		if (ret)
 			panic("Could not initialize timer (err %d)\n", ret);
-#endif
 	}
 
 	ret = timer_get_count(gd->timer, &count);