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

From	fu.wei@linaro.org
Newsgroups	linux.kernel
Subject	[PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout
Date	2016-05-31 08:10 +0200
Message-ID	<rEL2h-75S-5@gated-at.bofh.it> (permalink)
References	<rEL2h-75S-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout fu.wei@linaro.org - 2016-05-31 08:10 +0200
  Re: [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of  max_timeout Guenter Roeck <linux@roeck-us.net> - 2016-06-01 23:50 +0200

csiph-web