From 3ff3d2c172a0b88ddf3f71e96b83bfe89231de1a Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 9 Jan 2006 21:59:39 +0100
Subject: [PATCH] --- yaml --- r: 20231 b: refs/heads/master c:
 85875211acc94ecb76fe04fbebc6aca12b6da60d h: refs/heads/master i:   20229:
 5c2ab0289d315a486c5ef305a631e4c8821266d5   20227:
 8b7433c6562807285c52e5a45900be33b0093009   20223:
 69c304238afb1bac00819a7a473bbf52cf7c20c7 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/char/watchdog/pcwd.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 468b357e2c15..9f05ddf1e633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f0235dccc3f7bffc32abcef2aec3d1b15c61927
+refs/heads/master: 85875211acc94ecb76fe04fbebc6aca12b6da60d
diff --git a/trunk/drivers/char/watchdog/pcwd.c b/trunk/drivers/char/watchdog/pcwd.c
index 0635cd724365..0549b2e89966 100644
--- a/trunk/drivers/char/watchdog/pcwd.c
+++ b/trunk/drivers/char/watchdog/pcwd.c
@@ -223,6 +223,12 @@ static void unset_command_mode(void)
 	pcwd_private.command_mode = 0;
 }
 
+static inline void pcwd_check_temperature_support(void)
+{
+	if (inb(pcwd_private.io_addr) != 0xF0)
+		pcwd_private.supports_temp = 1;
+}
+
 static void pcwd_timer_ping(unsigned long data)
 {
 	int wdrst_stat;
@@ -623,12 +629,6 @@ static struct notifier_block pcwd_notifier = {
  *	Init & exit routines
  */
 
-static inline void get_support(void)
-{
-	if (inb(pcwd_private.io_addr) != 0xF0)
-		pcwd_private.supports_temp = 1;
-}
-
 static inline int get_revision(void)
 {
 	int r = PCWD_REVISION_C;
@@ -730,7 +730,7 @@ static int __devinit pcwatchdog_init(int base_addr)
 	pcwd_stop();
 
 	/*  Check whether or not the card supports the temperature device */
-	get_support();
+	pcwd_check_temperature_support();
 
 	/* Get some extra info from the hardware (in command/debug/diag mode) */
 	if (pcwd_private.revision == PCWD_REVISION_A)