watchdog: uniphier: change order for setting default timeout
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
@@ -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
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
@@ -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
PATCH 2/4 watchdog: omap_wdt: change order for setting default timeout
In reply to Marcus Folkessonwatchdog_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
@@ -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
PATCH 3/4 watchdog: gpio: change order for setting default timeout
In reply to Marcus Folkessonwatchdog_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
@@ -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
Quoted 4 lines · Marcus Folkesson
watchdog_init_timeout()will preservewdd->timeoutvalue if no parameter nor timeout-secs dt property is set.Signed-off-by Marcus Folkesson <[email protected]>
Quoted 23 lines
--- drivers/watchdog/uniphier_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/watchdog/uniphier_wdt.c +2
-3@@ -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);
Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout
In reply to Marcus FolkessonQuoted 4 lines · Marcus Folkesson
watchdog_init_timeout()will preservewdd->timeoutvalue if no parameter nor timeout-secs dt property is set.Signed-off-by Marcus Folkesson <[email protected]>
Quoted 22 lines
--- drivers/watchdog/omap_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/watchdog/omap_wdt.c +2
-2@@ -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);
Re: [PATCH 3/4] watchdog: gpio: change order for setting default timeout
In reply to Marcus FolkessonQuoted 4 lines · Marcus Folkesson
watchdog_init_timeout()will preservewdd->timeoutvalue if no parameter nor timeout-secs dt property is set.Signed-off-by Marcus Folkesson <[email protected]>
Quoted 21 lines
--- drivers/watchdog/gpio_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/watchdog/gpio_wdt.c +2
-2@@ -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);
Re: [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
In reply to Marcus FolkessonQuoted 1 line · Marcus Folkesson
Signed-off-by Marcus Folkesson <[email protected]>
Quoted 18 lines
--- drivers/watchdog/lpc18xx_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/lpc18xx_wdt.c +1
-1@@ -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);
2018-02-11 5:36 GMT+09:00 Marcus Folkesson <[email protected]>:
Quoted 27 lines
watchdog_init_timeout()will preservewdd->timeoutvalue if no parameter nor timeout-secs dt property is set.Signed-off-by Marcus Folkesson <[email protected]>--- drivers/watchdog/uniphier_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/watchdog/uniphier_wdt.c +2
-4@@ -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