summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2022-09-02 15:10:46 +0300
committerStefan Roese <sr@denx.de>2022-09-18 11:26:33 +0300
commit29caf9305b6fafe8f6d6b18fa1f825dff8686e61 (patch)
tree6530f6a2373b7af6fb4fdceca823b21f7c79ed7f /fs
parent881d4108257a45ac890ef27c523783dbe401e462 (diff)
downloadu-boot-29caf9305b6fafe8f6d6b18fa1f825dff8686e61.tar.xz
cyclic: Use schedule() instead of WATCHDOG_RESET()
Globally replace all occurances of WATCHDOG_RESET() with schedule(), which handles the HW_WATCHDOG functionality and the cyclic infrastructure. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Tom Rini <trini@konsulko.com> [am335x_evm, mx6cuboxi, rpi_3,dra7xx_evm, pine64_plus, am65x_evm, j721e_evm]
Diffstat (limited to 'fs')
-rw-r--r--fs/cramfs/uncompress.c3
-rw-r--r--fs/jffs2/jffs2_1pass.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 38e10e2e44..0d071b69f4 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -21,6 +21,7 @@
*/
#include <common.h>
+#include <cyclic.h>
#include <malloc.h>
#include <watchdog.h>
#include <u-boot/zlib.h>
@@ -62,7 +63,7 @@ int cramfs_uncompress_init (void)
stream.avail_in = 0;
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
- stream.outcb = (cb_func)watchdog_reset_func;
+ stream.outcb = (cb_func)cyclic_run;
#else
stream.outcb = Z_NULL;
#endif /* CONFIG_HW_WATCHDOG */
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index ef7b302725..49ba82ef95 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -1523,7 +1523,7 @@ jffs2_1pass_build_lists(struct part_info * part)
/* Set buf_size to maximum length */
buf_size = DEFAULT_EMPTY_SCAN_SIZE;
- WATCHDOG_RESET();
+ schedule();
#ifdef CONFIG_JFFS2_SUMMARY
buf_len = sizeof(*sm);