test: dm: wdt: replace cyclic_run() by schedule()

This is the last place outside of cyclic.c that references
cyclic_run() directly. Replace by schedule(), so that cyclic_run() can
be made private. This also better matches what I believe commit
29caf9305b6f ("cyclic: Use schedule() instead of WATCHDOG_RESET()")
intended to do.

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index 710414881fa3fc83b345395b598afa5549ba8eac..bef29591d5abb71847c1b794fea955f2b11944d9 100644 (file)
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -3,7 +3,6 @@
  * Copyright 2017 Google, Inc
  */
 
-#include <cyclic.h>
 #include <dm.h>
 #include <time.h>
 #include <wdt.h>
@@ -14,6 +13,7 @@
 #include <test/test.h>
 #include <test/ut.h>
 #include <linux/delay.h>
+#include <u-boot/schedule.h>
 #include <watchdog.h>
 
 /* Test that watchdog driver functions are called */
@@ -131,7 +131,7 @@ static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts)
        /* Neither device should be "started", so watchdog_reset() should be a no-op. */
        reset_count = state->wdt.reset_count;
        val = sandbox_gpio_get_value(gpio, offset);
-       cyclic_run();
+       schedule();
        ut_asserteq(reset_count, state->wdt.reset_count);
        ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));
 
@@ -141,19 +141,19 @@ static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts)
 
        /* Make sure both devices have just been pinged. */
        timer_test_add_offset(100);
-       cyclic_run();
+       schedule();
        reset_count = state->wdt.reset_count;
        val = sandbox_gpio_get_value(gpio, offset);
 
        /* The gpio watchdog should be pinged, the sandbox one not. */
        timer_test_add_offset(30);
-       cyclic_run();
+       schedule();
        ut_asserteq(reset_count, state->wdt.reset_count);
        ut_asserteq(!val, sandbox_gpio_get_value(gpio, offset));
 
        /* After another ~30ms, both devices should get pinged. */
        timer_test_add_offset(30);
-       cyclic_run();
+       schedule();
        ut_asserteq(reset_count + 1, state->wdt.reset_count);
        ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));