linux-amlogic.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree
Date: Sun, 11 Feb 2018 21:08:41 +0100	[thread overview]
Message-ID: <20180211200847.25000-1-marcus.folkesson@gmail.com> (raw)

watchdog_init_timeout() will allways pick timeout_param since it
defaults to a valid timeout.

Following best practice described in
Documentation/watchdog/watchdog-kernel-api.txt to make use of
the parameter logic.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---

Notes:
    v3:
    	- Use wdd->timeout instead of wdt_timeout when print out
    	  timout in probe function.

 drivers/watchdog/sama5d4_wdt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 0ae947c3d7bc..255169916dbb 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -33,7 +33,7 @@ struct sama5d4_wdt {
 	unsigned long		last_ping;
 };
 
-static int wdt_timeout = WDT_DEFAULT_TIMEOUT;
+static int wdt_timeout;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
 module_param(wdt_timeout, int, 0);
@@ -212,7 +212,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	wdd = &wdt->wdd;
-	wdd->timeout = wdt_timeout;
+	wdd->timeout = WDT_DEFAULT_TIMEOUT;
 	wdd->info = &sama5d4_wdt_info;
 	wdd->ops = &sama5d4_wdt_ops;
 	wdd->min_timeout = MIN_WDT_TIMEOUT;
@@ -273,7 +273,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, wdt);
 
 	dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
-		 wdt_timeout, nowayout);
+		 wdd->timeout, nowayout);
 
 	return 0;
 }
-- 
2.15.1

             reply	other threads:[~2018-02-11 20:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-11 20:08 Marcus Folkesson [this message]
2018-02-11 20:08 ` [PATCH v3 2/7] watchdog: sunxi: allow setting timeout in devicetree Marcus Folkesson
2018-02-19  0:06   ` Rob Herring
2018-02-19  3:01     ` Chen-Yu Tsai
2018-02-11 20:08 ` [PATCH v3 3/7] watchdog: sirfsoc: " Marcus Folkesson
2018-02-19  0:07   ` Rob Herring
2018-02-19  1:07     ` Guenter Roeck
2018-02-22  0:02       ` Rob Herring
2018-02-11 20:08 ` [PATCH v3 4/7] watchdog: pnx4008: make use of timeout-secs provided " Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 5/7] watchdog: mtk: allow setting timeout " Marcus Folkesson
2018-02-19  0:08   ` Rob Herring
2018-02-19  1:08     ` Guenter Roeck
2018-02-19 17:02   ` Matthias Brugger
2018-02-11 20:08 ` [PATCH v3 6/7] watchdog: meson: " Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
2018-02-12  1:11   ` [v3, " Guenter Roeck
2018-02-22 14:01   ` [PATCH v3 " Linus Walleij
2018-02-12  1:10 ` [v3, 1/7] watchdog: sama5d4: " Guenter Roeck
2018-02-12  8:59 ` [PATCH v3 " Nicolas Ferre
2018-03-16 13:37 ` Marcus Folkesson
2018-03-17  1:56   ` Guenter Roeck
2018-03-17  8:37     ` Marcus Folkesson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180211200847.25000-1-marcus.folkesson@gmail.com \
    --to=marcus.folkesson@gmail.com \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).