lkml.org 
[lkml]   [2016]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout
On Tue, May 31, 2016 at 02:08:09PM +0800, fu.wei@linaro.org wrote:
> From: Pratyush Anand <panand@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@redhat.com>
> Signed-off-by: Fu Wei <fu.wei@linaro.org>

Reviewed-by: Guenter Roeck <linux@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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

\
 
 \ /
  Last update: 2016-06-02 00:01    [W:0.103 / U:0.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site