* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
@ 2018-02-10 20:36 Marcus Folkesson
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
To: linux-arm-kernel
watchdog_init_timeout() will preserve wdd->timeout value if no parameter
nor timeout-secs dt property is set.
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
drivers/watchdog/uniphier_wdt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c
index 0ea2339d9702..0e4f8d53ce3c 100644
--- a/drivers/watchdog/uniphier_wdt.c
+++ b/drivers/watchdog/uniphier_wdt.c
@@ -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);
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
2018-02-10 20:36 [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Marcus Folkesson
@ 2018-02-10 20:36 ` Marcus Folkesson
2018-02-11 3:56 ` Guenter Roeck
2018-02-11 3:54 ` [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Guenter Roeck
2018-02-21 1:29 ` Masahiro Yamada
2 siblings, 1 reply; 5+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
drivers/watchdog/lpc18xx_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
index b4221f43cd94..331cadb459ac 100644
--- a/drivers/watchdog/lpc18xx_wdt.c
+++ b/drivers/watchdog/lpc18xx_wdt.c
@@ -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);
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
@ 2018-02-11 3:56 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2018-02-11 3:56 UTC (permalink / raw)
To: linux-arm-kernel
On 02/10/2018 12:36 PM, Marcus Folkesson wrote:
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/lpc18xx_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
> index b4221f43cd94..331cadb459ac 100644
> --- a/drivers/watchdog/lpc18xx_wdt.c
> +++ b/drivers/watchdog/lpc18xx_wdt.c
> @@ -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);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
2018-02-10 20:36 [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Marcus Folkesson
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
@ 2018-02-11 3:54 ` Guenter Roeck
2018-02-21 1:29 ` Masahiro Yamada
2 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2018-02-11 3:54 UTC (permalink / raw)
To: linux-arm-kernel
On 02/10/2018 12:36 PM, Marcus Folkesson wrote:
> watchdog_init_timeout() will preserve wdd->timeout value if no parameter
> nor timeout-secs dt property is set.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/uniphier_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c
> index 0ea2339d9702..0e4f8d53ce3c 100644
> --- a/drivers/watchdog/uniphier_wdt.c
> +++ b/drivers/watchdog/uniphier_wdt.c
> @@ -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);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
2018-02-10 20:36 [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Marcus Folkesson
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
2018-02-11 3:54 ` [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Guenter Roeck
@ 2018-02-21 1:29 ` Masahiro Yamada
2 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-02-21 1:29 UTC (permalink / raw)
To: linux-arm-kernel
2018-02-11 5:36 GMT+09:00 Marcus Folkesson <marcus.folkesson@gmail.com>:
> watchdog_init_timeout() will preserve wdd->timeout value if no parameter
> nor timeout-secs dt property is set.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
> drivers/watchdog/uniphier_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c
> index 0ea2339d9702..0e4f8d53ce3c 100644
> --- a/drivers/watchdog/uniphier_wdt.c
> +++ b/drivers/watchdog/uniphier_wdt.c
> @@ -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);
>
> --
> 2.15.1
>
I am pasting Acked-by from the author here just in case.
Acked-by: Keiji Hayashibara <hayashibara.keiji@socionext.com>
You can see his original tag here.
https://www.spinics.net/lists/linux-watchdog/msg13513.html
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-21 1:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-10 20:36 [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Marcus Folkesson
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
2018-02-11 3:56 ` Guenter Roeck
2018-02-11 3:54 ` [PATCH 1/4] watchdog: uniphier: change order for setting default timeout Guenter Roeck
2018-02-21 1:29 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).