Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Stefan Riedmueller <s.riedmueller@phytec.de>
To:     Wim Van Sebroeck <wim@linux-watchdog.org>,
        Guenter Roeck <linux@roeck-us.net>,
        Support Opensource <support.opensource@diasemi.com>
Cc:     linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/3] watchdog: da9062: No need to ping manually before setting timeout
Date:   Fri, 3 Apr 2020 15:07:28 +0200
Message-Id: <20200403130728.39260-3-s.riedmueller@phytec.de>
In-Reply-To: <20200403130728.39260-1-s.riedmueller@phytec.de>
References: <20200403130728.39260-1-s.riedmueller@phytec.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

There is actually no need to ping the watchdog before disabling it
during timeout change. Disabling the watchdog already takes care of
resetting the counter.

This fixes an issue during boot when the userspace watchdog handler takes
over and the watchdog is already running. Opening the watchdog in this case
leads to the first ping and directly after that without the required
heartbeat delay a second ping issued by the set=5Ftimeout call. Due to the
missing delay this resulted in a reset.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
Changes in v2:
 - Added Reviewed-by tags.
---
 drivers/watchdog/da9062=5Fwdt.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/watchdog/da9062=5Fwdt.c b/drivers/watchdog/da9062=5Fwd=
t.c
index 10b37dd65bed..706fb09c2f24 100644
--- a/drivers/watchdog/da9062=5Fwdt.c
+++ b/drivers/watchdog/da9062=5Fwdt.c
@@ -67,11 +67,6 @@ static int da9062=5Fwdt=5Fupdate=5Ftimeout=5Fregister(st=
ruct da9062=5Fwatchdog *wdt,
 					      unsigned int regval)
 {
 	struct da9062 *chip =3D wdt->hw;
-	int ret;
-
-	ret =3D da9062=5Freset=5Fwatchdog=5Ftimer(wdt);
-	if (ret)
-		return ret;
=20
 	regmap=5Fupdate=5Fbits(chip->regmap,
 				  DA9062AA=5FCONTROL=5FD,
--=20
2.23.0