diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-10-24 17:24:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-29 10:23:43 +0100 |
| commit | 07dc9dfd190da4caaed828fd1e1b6b024133614f (patch) | |
| tree | 85ef148c92fec302dcf711de4cfb8e77f4f04e60 | |
| parent | 3c38c8470e60cda83cd059b826d8a627725643fc (diff) | |
| download | barebox-07dc9dfd190da4caaed828fd1e1b6b024133614f.tar.gz barebox-07dc9dfd190da4caaed828fd1e1b6b024133614f.tar.xz | |
watchdog: remove wrong uses of timeout_cur
The barebox watchdog poller uses the struct watchdog.timeout_cur as
the timeout value to configure the watchdog with.
There's no need for the device driver to set this. I didn't know that
when I wrote the drivers, but I do now, hence this commit.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/watchdog/stm32_iwdg.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/stpmic1_wdt.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c index 20536cb4ab..4d252e558c 100644 --- a/drivers/watchdog/stm32_iwdg.c +++ b/drivers/watchdog/stm32_iwdg.c @@ -256,7 +256,6 @@ static int stm32_iwdg_probe(struct device_d *dev) wdd->set_timeout = stm32_iwdg_set_timeout; wdd->timeout_max = (RLR_MAX + 1) * data->max_prescaler * 1000; wdd->timeout_max /= wd->rate * 1000; - wdd->timeout_cur = wdd->timeout_max; ret = watchdog_register(wdd); if (ret) { diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c index eb8c43f716..f79b7e8c27 100644 --- a/drivers/watchdog/stpmic1_wdt.c +++ b/drivers/watchdog/stpmic1_wdt.c @@ -175,7 +175,6 @@ static int stpmic1_wdt_probe(struct device_d *dev) wdd->hwdev = dev; wdd->set_timeout = stpmic1_wdt_set_timeout; wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; - wdd->timeout_cur = PMIC_WDT_DEFAULT_TIMEOUT; /* have the watchdog reset, not power-off the system */ regmap_write_bits(wdt->regmap, MAIN_CR, RREQ_EN, RREQ_EN); |