diff options
| author | Simon Glass <sjg@chromium.org> | 2023-01-15 14:15:43 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-11 12:22:34 -0500 |
| commit | 64d445a3b7018dac5131cba9f5d308c64a45e95f (patch) | |
| tree | 6b8f4f7f36ad9981e1011d87551ef0a458f83cc5 /lib/time.c | |
| parent | 4aa5053da5fa0729d30bce5df9a0a037a391f2f3 (diff) | |
| download | u-boot-64d445a3b7018dac5131cba9f5d308c64a45e95f.tar.gz | |
time: Tidy up some unnecessary #ifdefs
Avoid using the preprocessor with TIMER_EARLY.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/time.c')
| -rw-r--r-- | lib/time.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/time.c b/lib/time.c index 5252190af5..00f4a1ac8f 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); |