aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/pcwd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 0635cd724365..0549b2e89966 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -223,6 +223,12 @@ static void unset_command_mode(void)
223 pcwd_private.command_mode = 0; 223 pcwd_private.command_mode = 0;
224} 224}
225 225
226static inline void pcwd_check_temperature_support(void)
227{
228 if (inb(pcwd_private.io_addr) != 0xF0)
229 pcwd_private.supports_temp = 1;
230}
231
226static void pcwd_timer_ping(unsigned long data) 232static void pcwd_timer_ping(unsigned long data)
227{ 233{
228 int wdrst_stat; 234 int wdrst_stat;
@@ -623,12 +629,6 @@ static struct notifier_block pcwd_notifier = {
623 * Init & exit routines 629 * Init & exit routines
624 */ 630 */
625 631
626static inline void get_support(void)
627{
628 if (inb(pcwd_private.io_addr) != 0xF0)
629 pcwd_private.supports_temp = 1;
630}
631
632static inline int get_revision(void) 632static inline int get_revision(void)
633{ 633{
634 int r = PCWD_REVISION_C; 634 int r = PCWD_REVISION_C;
@@ -730,7 +730,7 @@ static int __devinit pcwatchdog_init(int base_addr)
730 pcwd_stop(); 730 pcwd_stop();
731 731
732 /* Check whether or not the card supports the temperature device */ 732 /* Check whether or not the card supports the temperature device */
733 get_support(); 733 pcwd_check_temperature_support();
734 734
735 /* Get some extra info from the hardware (in command/debug/diag mode) */ 735 /* Get some extra info from the hardware (in command/debug/diag mode) */
736 if (pcwd_private.revision == PCWD_REVISION_A) 736 if (pcwd_private.revision == PCWD_REVISION_A)