From: fabio.porcedda@gmail.com (Fabio Porcedda)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 7/8] watchdog: orion_wdt: move the min_timeout initialization
Date: Thu, 14 Feb 2013 09:14:29 +0100 [thread overview]
Message-ID: <1360829670-10418-8-git-send-email-fabio.porcedda@gmail.com> (raw)
In-Reply-To: <1360829670-10418-1-git-send-email-fabio.porcedda@gmail.com>
Move the min_timeout initialization inside the orion_wdt definition.
Only compile tested.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
drivers/watchdog/orion_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 3022a38..da57798 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -140,6 +140,7 @@ static const struct watchdog_ops orion_wdt_ops = {
static struct watchdog_device orion_wdt = {
.info = &orion_wdt_info,
.ops = &orion_wdt_ops,
+ .min_timeout = 1,
};
static int orion_wdt_probe(struct platform_device *pdev)
@@ -164,7 +165,6 @@ static int orion_wdt_probe(struct platform_device *pdev)
wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk;
- orion_wdt.min_timeout = 1;
orion_wdt.timeout = wdt_max_duration;
orion_wdt.max_timeout = wdt_max_duration;
watchdog_init_timeout(&orion_wdt, heartbeat, &pdev->dev);
--
1.8.1.1
next prev parent reply other threads:[~2013-02-14 8:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-14 8:14 [PATCH v9 0/8] watchdog: dt: add support for the timeout-sec dt property Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 1/8] watchdog: core: add static to watchdog_check_min_max_timeout() Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 2/8] watchdog: core: fix watchdog_check_min_max_timeout() return value Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 3/8] watchdog: orion_wdt: add timeout-sec property binding Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 4/8] watchdog: pnx4008: " Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 5/8] watchdog: s3c2410_wdt: " Fabio Porcedda
2013-02-14 8:14 ` [PATCH v9 6/8] watchdog: at91sam9_wdt: " Fabio Porcedda
2013-02-14 8:14 ` Fabio Porcedda [this message]
2013-02-14 8:14 ` [PATCH v9 8/8] watchdog: code: fix the alignement of some function declarations Fabio Porcedda
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=1360829670-10418-8-git-send-email-fabio.porcedda@gmail.com \
--to=fabio.porcedda@gmail.com \
--cc=linux-arm-kernel@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).