[PATCH] watchdog: Drop GD_FLG_WDT_READY as it's not used any more

Stefan Roese sr at denx.de
Thu Nov 17 09:20:34 CET 2022


Since commit c2fd0ca1a822
("watchdog: Integrate watchdog triggering into the cyclic framework")
GD_FLG_WDT_READY has become write-only. This patch now removes this
flag completely.

The vacant spot in gd_flags is filled with the newly introduced
GD_FLG_CYCLIC_RUNNING flag.

Suggested-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
Signed-off-by: Stefan Roese <sr at denx.de>
---
 drivers/watchdog/wdt-uclass.c     | 1 -
 include/asm-generic/global_data.h | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 82df0ff0be5a..509896a1b808 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -105,7 +105,6 @@ int initr_watchdog(void)
 		init_watchdog_dev(dev);
 	}
 
-	gd->flags |= GD_FLG_WDT_READY;
 	return 0;
 }
 
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 88829126fb2a..da17ac8cbc88 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -635,9 +635,9 @@ enum gd_flags {
 	 */
 	GD_FLG_LOG_READY = 0x10000,
 	/**
-	 * @GD_FLG_WDT_READY: watchdog is ready for use
+	 * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress
 	 */
-	GD_FLG_WDT_READY = 0x20000,
+	GD_FLG_CYCLIC_RUNNING = 0x20000,
 	/**
 	 * @GD_FLG_SKIP_LL_INIT: don't perform low-level initialization
 	 */
@@ -650,10 +650,6 @@ enum gd_flags {
 	 * @GD_FLG_FDT_CHANGED: Device tree change has been detected by tests
 	 */
 	GD_FLG_FDT_CHANGED = 0x100000,
-	/**
-	 * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress
-	 */
-	GD_FLG_CYCLIC_RUNNING = 0x200000,
 };
 
 #endif /* __ASSEMBLY__ */
-- 
2.38.1



More information about the U-Boot mailing list