[PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout

Guenter Roeck linux at roeck-us.net
Wed Jun 1 14:43:05 PDT 2016


On Tue, May 31, 2016 at 02:08:09PM +0800, fu.wei at linaro.org wrote:
> From: Pratyush Anand <panand at redhat.com>
> 
> Using max_hw_heartbeat_ms instead of max_timeout gives the flexibility to
> achieve higher user "timeout". Therefore, use this new infrastructure.
> 
> Signed-off-by: Pratyush Anand <panand at redhat.com>
> Signed-off-by: Fu Wei <fu.wei at linaro.org>

Reviewed-by: Guenter Roeck <linux at roeck-us.net>

> ---
>  drivers/watchdog/sbsa_gwdt.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
> index ad383f6..6af71e0 100644
> --- a/drivers/watchdog/sbsa_gwdt.c
> +++ b/drivers/watchdog/sbsa_gwdt.c
> @@ -273,7 +273,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
>  	wdd->info = &sbsa_gwdt_info;
>  	wdd->ops = &sbsa_gwdt_ops;
>  	wdd->min_timeout = 1;
> -	wdd->max_timeout = U32_MAX / gwdt->clk;
> +	wdd->max_hw_heartbeat_ms = U32_MAX / gwdt->clk * 1000;
>  	wdd->timeout = DEFAULT_TIMEOUT;
>  	watchdog_set_drvdata(wdd, gwdt);
>  	watchdog_set_nowayout(wdd, nowayout);
> @@ -310,7 +310,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
>  	 * the timeout is (WOR * 2), so the maximum timeout should be doubled.
>  	 */
>  	if (!action)
> -		wdd->max_timeout *= 2;
> +		wdd->max_hw_heartbeat_ms *= 2;
>  
>  	watchdog_init_timeout(wdd, timeout, dev);
>  	/*
> -- 
> 2.5.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the linux-arm-kernel mailing list