All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: u-boot@lists.denx.de
Cc: Simon Glass <sjg@chromium.org>, Stefan Roese <sr@denx.de>,
	Tom Rini <trini@konsulko.com>,
	Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Subject: [PATCH v3 01/10] watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now()
Date: Fri,  2 Jul 2021 14:45:01 +0200	[thread overview]
Message-ID: <20210702124510.124401-2-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <20210702124510.124401-1-rasmus.villemoes@prevas.dk>

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 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 2687135296..634428fa24 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -118,10 +118,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;
 
-- 
2.31.1


  reply	other threads:[~2021-07-02 12:45 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02 12:45 [PATCH v3 00/10] handling all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-07-02 12:45 ` Rasmus Villemoes [this message]
2021-07-02 12:45 ` [PATCH v3 02/10] watchdog: wdt-uclass.c: introduce struct wdt_priv Rasmus Villemoes
2021-07-05  7:17   ` Stefan Roese
2021-07-02 12:45 ` [PATCH v3 03/10] watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 04/10] watchdog: wdt-uclass.c: refactor initr_watchdog() Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 05/10] watchdog: wdt-uclass.c: keep track of each device's running state Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 06/10] sandbox: disable CONFIG_WATCHDOG_AUTOSTART Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 07/10] watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-07-05 15:30   ` Simon Glass
2021-07-15  8:15     ` Stefan Roese
2021-07-31 10:06       ` Stefan Roese
2021-08-02  9:18         ` Rasmus Villemoes
2021-08-02 10:39           ` Stefan Roese
2021-08-02 19:20           ` Simon Glass
2021-08-03  6:48             ` Rasmus Villemoes
2021-08-04 14:35               ` Simon Glass
2021-07-02 12:45 ` [PATCH v3 08/10] watchdog: add gpio watchdog driver Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 09/10] sandbox: add test of wdt_gpio driver Rasmus Villemoes
2021-07-02 12:45 ` [PATCH v3 10/10] sandbox: add test of wdt-uclass' watchdog_reset() Rasmus Villemoes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210702124510.124401-2-rasmus.villemoes@prevas.dk \
    --to=rasmus.villemoes@prevas.dk \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.