time: Tidy up some unnecessary #ifdefs
Avoid using the preprocessor with TIMER_EARLY. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
14
lib/time.c
14
lib/time.c
@@ -70,15 +70,14 @@ extern unsigned long timer_read_counter(void);
|
|||||||
ulong notrace get_tbclk(void)
|
ulong notrace get_tbclk(void)
|
||||||
{
|
{
|
||||||
if (!gd->timer) {
|
if (!gd->timer) {
|
||||||
#ifdef CONFIG_TIMER_EARLY
|
|
||||||
return timer_early_get_rate();
|
|
||||||
#else
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (IS_ENABLED(CONFIG_TIMER_EARLY))
|
||||||
|
return timer_early_get_rate();
|
||||||
|
|
||||||
ret = dm_timer_init();
|
ret = dm_timer_init();
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return timer_get_rate(gd->timer);
|
return timer_get_rate(gd->timer);
|
||||||
@@ -90,15 +89,14 @@ uint64_t notrace get_ticks(void)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!gd->timer) {
|
if (!gd->timer) {
|
||||||
#ifdef CONFIG_TIMER_EARLY
|
|
||||||
return timer_early_get_count();
|
|
||||||
#else
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (IS_ENABLED(CONFIG_TIMER_EARLY))
|
||||||
|
return timer_early_get_count();
|
||||||
|
|
||||||
ret = dm_timer_init();
|
ret = dm_timer_init();
|
||||||
if (ret)
|
if (ret)
|
||||||
panic("Could not initialize timer (err %d)\n", ret);
|
panic("Could not initialize timer (err %d)\n", ret);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = timer_get_count(gd->timer, &count);
|
ret = timer_get_count(gd->timer, &count);
|
||||||
|
Reference in New Issue
Block a user