Skip to contentSkip to conversation

watchdog: uniphier: change order for setting default timeout

PATCH In review Marcus Folkesson 3 participants 9 messages Feb 10, 2018 – Feb 21, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 watchdog: uniphier: change order for setting default timeout

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

---
 drivers/watchdog/uniphier_wdt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/uniphier_wdt.c +2 -3
index 0ea2339d9702..0e4f8d53ce3c 100644
@@ -212,11 +212,10 @@ static int uniphier_wdt_probe(struct platform_device *pdev)
 	wdev->wdt_dev.ops = &uniphier_wdt_ops;
 	wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX;
 	wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN;
+	wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
 	wdev->wdt_dev.parent = dev;
 
-	if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) {
-		wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
-	}
+	watchdog_init_timeout(&wdev->wdt_dev, timeout, dev);
 	watchdog_set_nowayout(&wdev->wdt_dev, nowayout);
 	watchdog_stop_on_reboot(&wdev->wdt_dev);
 
Signature · 1 line
2.15.1
#5 lore raw

PATCH 4/4 watchdog: lpc18xx: remove assignment of unused ret-value

---
 drivers/watchdog/lpc18xx_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/lpc18xx_wdt.c +1 -1
index b4221f43cd94..331cadb459ac 100644
@@ -265,7 +265,7 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev)
 	lpc18xx_wdt->wdt_dev.parent = dev;
 	watchdog_set_drvdata(&lpc18xx_wdt->wdt_dev, lpc18xx_wdt);
 
-	ret = watchdog_init_timeout(&lpc18xx_wdt->wdt_dev, heartbeat, dev);
+	watchdog_init_timeout(&lpc18xx_wdt->wdt_dev, heartbeat, dev);
 
 	__lpc18xx_wdt_set_timeout(lpc18xx_wdt);
 
Signature · 1 line
2.15.1
#1 lore raw

PATCH 2/4 watchdog: omap_wdt: change order for setting default timeout

In reply to Marcus Folkesson

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

---
 drivers/watchdog/omap_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/omap_wdt.c +2 -2
index 1b02bfa81b29..ae77112ce97f 100644
@@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev)
 	wdev->wdog.ops = &omap_wdt_ops;
 	wdev->wdog.min_timeout = TIMER_MARGIN_MIN;
 	wdev->wdog.max_timeout = TIMER_MARGIN_MAX;
+	wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
 	wdev->wdog.parent = &pdev->dev;
 
-	if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)
-		wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
+	watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);
 
 	watchdog_set_nowayout(&wdev->wdog, nowayout);
 
Signature · 1 line
2.15.1
#3 lore raw

PATCH 3/4 watchdog: gpio: change order for setting default timeout

In reply to Marcus Folkesson

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

---
 drivers/watchdog/gpio_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/gpio_wdt.c +2 -2
index cb66c2f99ff1..d0e8203f7a60 100644
@@ -156,9 +156,9 @@ static int gpio_wdt_probe(struct platform_device *pdev)
 	priv->wdd.min_timeout	= SOFT_TIMEOUT_MIN;
 	priv->wdd.max_hw_heartbeat_ms = hw_margin;
 	priv->wdd.parent	= &pdev->dev;
+	priv->wdd.timeout = SOFT_TIMEOUT_DEF;
 
-	if (watchdog_init_timeout(&priv->wdd, 0, &pdev->dev) < 0)
-		priv->wdd.timeout = SOFT_TIMEOUT_DEF;
+	watchdog_init_timeout(&priv->wdd, 0, &pdev->dev);
 
 	watchdog_stop_on_reboot(&priv->wdd);
 
Signature · 1 line
2.15.1
maintainer Reviewed-by on v1 1/4
#7 lore raw
In reply to Marcus Folkesson
Quoted 4 lines · Marcus Folkesson

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

Quoted 23 lines
---
  drivers/watchdog/uniphier_wdt.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/uniphier_wdt.c +2 -3
index 0ea2339d9702..0e4f8d53ce3c 100644
@@ -212,11 +212,10 @@ static int uniphier_wdt_probe(struct platform_device *pdev)
  	wdev->wdt_dev.ops = &uniphier_wdt_ops;
  	wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX;
  	wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN;
+	wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
  	wdev->wdt_dev.parent = dev;
 
-	if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) {
-		wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
-	}
+	watchdog_init_timeout(&wdev->wdt_dev, timeout, dev);
  	watchdog_set_nowayout(&wdev->wdt_dev, nowayout);
  	watchdog_stop_on_reboot(&wdev->wdt_dev);
 
maintainer Reviewed-by on v1 2/4
#2 lore raw

Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout

In reply to Marcus Folkesson
Quoted 4 lines · Marcus Folkesson

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

Quoted 22 lines
---
  drivers/watchdog/omap_wdt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/omap_wdt.c +2 -2
index 1b02bfa81b29..ae77112ce97f 100644
@@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev)
  	wdev->wdog.ops = &omap_wdt_ops;
  	wdev->wdog.min_timeout = TIMER_MARGIN_MIN;
  	wdev->wdog.max_timeout = TIMER_MARGIN_MAX;
+	wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
  	wdev->wdog.parent = &pdev->dev;
 
-	if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)
-		wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
+	watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);
 
  	watchdog_set_nowayout(&wdev->wdog, nowayout);
 
maintainer Reviewed-by on v1 3/4
#4 lore raw

Re: [PATCH 3/4] watchdog: gpio: change order for setting default timeout

In reply to Marcus Folkesson
Quoted 4 lines · Marcus Folkesson

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

Quoted 21 lines
---
  drivers/watchdog/gpio_wdt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/gpio_wdt.c +2 -2
index cb66c2f99ff1..d0e8203f7a60 100644
@@ -156,9 +156,9 @@ static int gpio_wdt_probe(struct platform_device *pdev)
  	priv->wdd.min_timeout	= SOFT_TIMEOUT_MIN;
  	priv->wdd.max_hw_heartbeat_ms = hw_margin;
  	priv->wdd.parent	= &pdev->dev;
+	priv->wdd.timeout = SOFT_TIMEOUT_DEF;
 
-	if (watchdog_init_timeout(&priv->wdd, 0, &pdev->dev) < 0)
-		priv->wdd.timeout = SOFT_TIMEOUT_DEF;
+	watchdog_init_timeout(&priv->wdd, 0, &pdev->dev);
 
  	watchdog_stop_on_reboot(&priv->wdd);
 
maintainer Reviewed-by on v1 4/4
#6 lore raw

Re: [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value

In reply to Marcus Folkesson
Quoted 1 line · Marcus Folkesson
Quoted 18 lines
---
  drivers/watchdog/lpc18xx_wdt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/lpc18xx_wdt.c +1 -1
index b4221f43cd94..331cadb459ac 100644
@@ -265,7 +265,7 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev)
  	lpc18xx_wdt->wdt_dev.parent = dev;
  	watchdog_set_drvdata(&lpc18xx_wdt->wdt_dev, lpc18xx_wdt);
 
-	ret = watchdog_init_timeout(&lpc18xx_wdt->wdt_dev, heartbeat, dev);
+	watchdog_init_timeout(&lpc18xx_wdt->wdt_dev, heartbeat, dev);
 
  	__lpc18xx_wdt_set_timeout(lpc18xx_wdt);
 
Acked-by Keiji Hayashibara on v1 1/4
#8 lore raw
In reply to Marcus Folkesson

2018-02-11 5:36 GMT+09:00 Marcus Folkesson <[email protected]>:

Quoted 27 lines

watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set.

---
 drivers/watchdog/uniphier_wdt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/uniphier_wdt.c +2 -4
index 0ea2339d9702..0e4f8d53ce3c 100644
@@ -212,11 +212,10 @@ static int uniphier_wdt_probe(struct platform_device *pdev)
        wdev->wdt_dev.ops = &uniphier_wdt_ops;
        wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX;
        wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN;
+       wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
        wdev->wdt_dev.parent = dev;
 
-       if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) {
-               wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;
-       }
+       watchdog_init_timeout(&wdev->wdt_dev, timeout, dev);
        watchdog_set_nowayout(&wdev->wdt_dev, nowayout);
        watchdog_stop_on_reboot(&wdev->wdt_dev);
 
--
Quoted 2 lines

2.15.1

I am pasting Acked-by from the author here just in case.

You can see his original tag here.
https://www.spinics.net/lists/linux-watchdog/msg13513.html

Signature · 2 lines
Best Regards
Masahiro Yamada