]> git.baikalelectronics.ru Git - uboot.git/commitdiff
time: Tidy up some unnecessary #ifdefs
authorSimon Glass <sjg@chromium.org>
Sun, 15 Jan 2023 21:15:43 +0000 (14:15 -0700)
committerTom Rini <trini@konsulko.com>
Sat, 11 Feb 2023 17:22:34 +0000 (12:22 -0500)
Avoid using the preprocessor with TIMER_EARLY.

Signed-off-by: Simon Glass <sjg@chromium.org>
lib/time.c

index 5252190af53f3c01acf01fcba597022c629ac1ca..00f4a1ac8fb3c86791441366bddc4331f86c610b 100644 (file)
@@ -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);