All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
@ 2018-02-10 20:36 ` Marcus Folkesson
  0 siblings, 0 replies; 14+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
  To: Wim Van Sebroeck, Guenter Roeck, Masahiro Yamada
  Cc: Marcus Folkesson, linux-watchdog, linux-arm-kernel, linux-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] 14+ messages in thread
* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
@ 2018-02-10 20:36 ` Marcus Folkesson
  0 siblings, 0 replies; 14+ 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] 14+ messages in thread
* [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout
  2018-02-10 20:36 ` Marcus Folkesson
  (?)
@ 2018-02-10 20:36 ` Marcus Folkesson
  2018-02-11  3:54   ` Guenter Roeck
  -1 siblings, 1 reply; 14+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
  To: Wim Van Sebroeck, Guenter Roeck
  Cc: Marcus Folkesson, linux-watchdog, linux-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/omap_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 1b02bfa81b29..ae77112ce97f 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -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);
 
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 3/4] watchdog: gpio: change order for setting default timeout
  2018-02-10 20:36 ` Marcus Folkesson
  (?)
  (?)
@ 2018-02-10 20:36 ` Marcus Folkesson
  2018-02-11  3:55   ` Guenter Roeck
  -1 siblings, 1 reply; 14+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
  To: Wim Van Sebroeck, Guenter Roeck
  Cc: Marcus Folkesson, linux-watchdog, linux-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/gpio_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index cb66c2f99ff1..d0e8203f7a60 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -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);
 
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
  2018-02-10 20:36 ` Marcus Folkesson
@ 2018-02-10 20:36   ` Marcus Folkesson
  -1 siblings, 0 replies; 14+ messages in thread
From: Marcus Folkesson @ 2018-02-10 20:36 UTC (permalink / raw)
  To: Wim Van Sebroeck, Guenter Roeck, Joachim Eastwood
  Cc: Marcus Folkesson, linux-watchdog, linux-arm-kernel, linux-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] 14+ messages in thread
* [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
@ 2018-02-10 20:36   ` Marcus Folkesson
  0 siblings, 0 replies; 14+ 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] 14+ messages in thread
* Re: [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
  2018-02-10 20:36 ` Marcus Folkesson
@ 2018-02-11  3:54   ` Guenter Roeck
  -1 siblings, 0 replies; 14+ messages in thread
From: Guenter Roeck @ 2018-02-11  3:54 UTC (permalink / raw)
  To: Marcus Folkesson, Wim Van Sebroeck, Masahiro Yamada
  Cc: linux-watchdog, linux-arm-kernel, linux-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] 14+ messages in thread
* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
@ 2018-02-11  3:54   ` Guenter Roeck
  0 siblings, 0 replies; 14+ 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] 14+ messages in thread
* Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout
  2018-02-10 20:36 ` [PATCH 2/4] watchdog: omap_wdt: " Marcus Folkesson
@ 2018-02-11  3:54   ` Guenter Roeck
  0 siblings, 0 replies; 14+ messages in thread
From: Guenter Roeck @ 2018-02-11  3:54 UTC (permalink / raw)
  To: Marcus Folkesson, Wim Van Sebroeck; +Cc: linux-watchdog, linux-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/omap_wdt.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
> index 1b02bfa81b29..ae77112ce97f 100644
> --- a/drivers/watchdog/omap_wdt.c
> +++ b/drivers/watchdog/omap_wdt.c
> @@ -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);
>   
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] watchdog: gpio: change order for setting default timeout
  2018-02-10 20:36 ` [PATCH 3/4] watchdog: gpio: " Marcus Folkesson
@ 2018-02-11  3:55   ` Guenter Roeck
  0 siblings, 0 replies; 14+ messages in thread
From: Guenter Roeck @ 2018-02-11  3:55 UTC (permalink / raw)
  To: Marcus Folkesson, Wim Van Sebroeck; +Cc: linux-watchdog, linux-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/gpio_wdt.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
> index cb66c2f99ff1..d0e8203f7a60 100644
> --- a/drivers/watchdog/gpio_wdt.c
> +++ b/drivers/watchdog/gpio_wdt.c
> @@ -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);
>   
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
  2018-02-10 20:36   ` Marcus Folkesson
@ 2018-02-11  3:56     ` Guenter Roeck
  -1 siblings, 0 replies; 14+ messages in thread
From: Guenter Roeck @ 2018-02-11  3:56 UTC (permalink / raw)
  To: Marcus Folkesson, Wim Van Sebroeck, Joachim Eastwood
  Cc: linux-watchdog, linux-arm-kernel, linux-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] 14+ messages in thread
* [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value
@ 2018-02-11  3:56     ` Guenter Roeck
  0 siblings, 0 replies; 14+ 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] 14+ messages in thread
* Re: [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
  2018-02-10 20:36 ` Marcus Folkesson
@ 2018-02-21  1:29   ` Masahiro Yamada
  -1 siblings, 0 replies; 14+ messages in thread
From: Masahiro Yamada @ 2018-02-21  1:29 UTC (permalink / raw)
  To: Marcus Folkesson
  Cc: Wim Van Sebroeck, Guenter Roeck, linux-watchdog,
	linux-arm-kernel, Linux Kernel Mailing List, Keiji Hayashibara,
	Jassi Brar, Masami Hiramatsu

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] 14+ messages in thread
* [PATCH 1/4] watchdog: uniphier: change order for setting default timeout
@ 2018-02-21  1:29   ` Masahiro Yamada
  0 siblings, 0 replies; 14+ 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] 14+ messages in thread
end of thread, other threads:[~2018-02-21  1:30 UTC | newest]

Thread overview: 14+ 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 ` Marcus Folkesson
2018-02-10 20:36 ` [PATCH 2/4] watchdog: omap_wdt: " Marcus Folkesson
2018-02-11  3:54   ` Guenter Roeck
2018-02-10 20:36 ` [PATCH 3/4] watchdog: gpio: " Marcus Folkesson
2018-02-11  3:55   ` Guenter Roeck
2018-02-10 20:36 ` [PATCH 4/4] watchdog: lpc18xx: remove assignment of unused ret-value Marcus Folkesson
2018-02-10 20:36   ` Marcus Folkesson
2018-02-11  3:56   ` Guenter Roeck
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-11  3:54   ` Guenter Roeck
2018-02-21  1:29 ` Masahiro Yamada
2018-02-21  1:29   ` Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.