aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-01-15 14:15:43 -0700
committerTom Rini <trini@konsulko.com>2023-02-11 11:08:34 -0500
commit3376c200aabe9e41fa661555582eff700f508c6b (patch)
treeb9994f70d1271a5324988ecff49c35e833f807d2
parent7e6c92cb744c7d6b2d198fef43afda546cf8f83f (diff)
downloadu-boot-3376c200aabe9e41fa661555582eff700f508c6b.zip
u-boot-3376c200aabe9e41fa661555582eff700f508c6b.tar.gz
u-boot-3376c200aabe9e41fa661555582eff700f508c6b.tar.bz2
time: Tidy up some unnecessary #ifdefsWIP/bisect
Avoid using the preprocessor with TIMER_EARLY. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--lib/time.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/time.c b/lib/time.c
index 5252190..00f4a1a 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);