[WATCHDOG] w83697hf/hg WDT driver - patch 7

This is patch 7 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - add w83697hf_unlock function to enter the
   chipsets extended function mode.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index ad397f912bd4..b1f225798500 100644
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -69,11 +69,17 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CON
 #define W83697HF_EFIR (wdt_io+0)        /* Extended Function Index Register (same as EFER) */
 #define W83697HF_EFDR (wdt_io+1)        /* Extended Function Data Register */
 
-static void
-w83697hf_select_wd_register(void)
+static inline void
+w83697hf_unlock(void)
 {
         outb_p(0x87, W83697HF_EFER);    /* Enter extended function mode */
         outb_p(0x87, W83697HF_EFER);    /* Again according to manual */
+}
+
+static void
+w83697hf_select_wd_register(void)
+{
+        w83697hf_unlock();
 
         outb_p(0x29, W83697HF_EFER);    /* select CR29 */
         outb_p(0x20, W83697HF_EFDR);    /* select WDTO */