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

Simon Glass sjg at chromium.org
Sun Jan 15 22:15:43 CET 2023


Avoid using the preprocessor with TIMER_EARLY.

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

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

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);
-- 
2.39.0.314.g84b9a713c41-goog



More information about the U-Boot mailing list