]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now()
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Thu, 19 Aug 2021 09:56:55 +0000 (11:56 +0200)
committerStefan Roese <sr@denx.de>
Tue, 31 Aug 2021 10:04:03 +0000 (12:04 +0200)
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>
drivers/watchdog/wdt-uclass.c

index 17334dbda6c981f5a312f8dce432dcfd6986241b..df8164da2ae0684d889d168de451ebdffaa317a3 100644 (file)
@@ -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;