aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2021-08-19 11:56:55 +0200
committerStefan Roese <sr@denx.de>2021-08-31 12:04:03 +0200
commit8967ebb65386396790e4c1c8b7c24a139a0f5c41 (patch)
treeac2f2e2b283d576b0d271dc5c2162eaeb44b3e95
parenta85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 (diff)
downloadu-boot-8967ebb65386396790e4c1c8b7c24a139a0f5c41.zip
u-boot-8967ebb65386396790e4c1c8b7c24a139a0f5c41.tar.gz
u-boot-8967ebb65386396790e4c1c8b7c24a139a0f5c41.tar.bz2
watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now()
wdt_start() does the "no ->start? return -ENOSYS" check, don't open-code that in wdt_expire_now(). Also, wdt_start() maintains some global (and later some per-device) state, which would get out of sync with this direct method call - not that it matters much here since the board is supposed to reset very soon. Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-rw-r--r--drivers/watchdog/wdt-uclass.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 17334db..df8164d 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -120,10 +120,8 @@ int wdt_expire_now(struct udevice *dev, ulong flags)
if (ops->expire_now) {
return ops->expire_now(dev, flags);
} else {
- if (!ops->start)
- return -ENOSYS;
+ ret = wdt_start(dev, 1, flags);
- ret = ops->start(dev, 1, flags);
if (ret < 0)
return ret;