From: wenyou.yang@atmel.com (Wenyou Yang)
To: linux-arm-kernel@lists.infradead.org
Subject: [v2 PATCH 3/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info
Date: Wed, 5 Dec 2012 09:34:22 +0800 [thread overview]
Message-ID: <1354671267-19277-4-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1354671267-19277-1-git-send-email-wenyou.yang@atmel.com>
Since the Watchdog Timer Mode Register can be only written only once,
so the watchdog_info shall not support WDIOF_SETTIMEOUT
and WDIOF_MAGICCLOSE options, remove them.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Cc: wim at iguana.be
Cc: linux-watchdog at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
---
drivers/watchdog/at91sam9_wdt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 92467d4..4dc6d61 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -156,8 +156,7 @@ static int at91wdt_enable(struct watchdog_device *wddev, unsigned int timeout)
static const struct watchdog_info at91_wdt_info = {
.identity = DRV_NAME,
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
- WDIOF_MAGICCLOSE,
+ .options = WDIOF_KEEPALIVEPING,
};
static int at91wdt_start(struct watchdog_device *wddev)
--
1.7.9.5
next prev parent reply other threads:[~2012-12-05 1:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 1:34 [v2 PATCH 0/8] watchdog/at91sam9_wdt: Convert to use the new framework Wenyou Yang
2012-12-05 1:34 ` [v2 PATCH 1/8] watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata struct Wenyou Yang
2012-12-05 1:34 ` [v2 PATCH 2/8] watchdog/at91sam9_wdt: Convert to use the watchdog framework Wenyou Yang
2012-12-05 10:47 ` Florian Fainelli
2012-12-06 0:54 ` Yang, Wenyou
2012-12-05 1:34 ` Wenyou Yang [this message]
2012-12-05 1:34 ` [v2 PATCH 4/8] watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver Kernel API Wenyou Yang
2012-12-05 1:34 ` [v2 PATCH 5/8] watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd Wenyou Yang
2012-12-05 1:34 ` [v2 PATCH 6/8] watchdog/at91sam9_wdt: Use module_platform_driver() Wenyou Yang
2012-12-06 18:16 ` Sergei Shtylyov
2012-12-07 7:12 ` Yang, Wenyou
2012-12-05 1:34 ` [v2 PATCH 7/8] ARM: dts: add the watchdog nodes for at91sam9x5 and at91sam9n12 SoC Wenyou Yang
2012-12-05 1:34 ` [v2 PATCH 8/8] ARM: dts: add the watchdog nodes for at91sam9g25ek boards Wenyou Yang
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=1354671267-19277-4-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.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).