[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1354671267-19277-4-git-send-email-wenyou.yang@atmel.com>
Date:	Wed,  5 Dec 2012 09:34:22 +0800
From:	Wenyou Yang <wenyou.yang@...el.com>
To:	linux-arm-kernel@...ts.infradead.org
Cc:	nicolas.ferre@...el.com, plagnioj@...osoft.com, JM.Lin@...el.com,
	wenyou.yang@...el.com, wim@...ana.be,
	linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [v2 PATCH 3/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info
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@...el.com>
Cc: wim@...ana.be
Cc: linux-watchdog@...r.kernel.org
Cc: linux-kernel@...r.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
