aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2006-02-12 11:44:57 -0500
committerWim Van Sebroeck <wim@iguana.be>2006-04-02 12:51:24 -0400
commit369fa25294b8225cb3a7fefabf047a2676bf6abd (patch)
tree914b84dd8a99ac548ccff579502845a6d4cfd023 /drivers/char/watchdog
parentc324ab4281d6b7a3130e9291d74b5c2361a16d56 (diff)
[WATCHDOG] pcwd.c general clean-up after patches
removal of includes (since we don't use kmalloc and TASK_INTERRUPTABLE anymore). Addition of missing commands. Printk that lets the user know when the module was unloaded. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/pcwd.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 0e4b3dfa0084..28a404adf8f0 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -66,8 +66,6 @@
66#include <linux/fs.h> /* For file operations */ 66#include <linux/fs.h> /* For file operations */
67#include <linux/ioport.h> /* For io-port access */ 67#include <linux/ioport.h> /* For io-port access */
68#include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */ 68#include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */
69#include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */
70#include <linux/slab.h> /* For kmalloc */
71 69
72#include <asm/uaccess.h> /* For copy_to_user/put_user/... */ 70#include <asm/uaccess.h> /* For copy_to_user/put_user/... */
73#include <asm/io.h> /* For inb/outb/... */ 71#include <asm/io.h> /* For inb/outb/... */
@@ -126,9 +124,14 @@
126#define CMD_ISA_VERSION_HUNDRETH 0x03 124#define CMD_ISA_VERSION_HUNDRETH 0x03
127#define CMD_ISA_VERSION_MINOR 0x04 125#define CMD_ISA_VERSION_MINOR 0x04
128#define CMD_ISA_SWITCH_SETTINGS 0x05 126#define CMD_ISA_SWITCH_SETTINGS 0x05
127#define CMD_ISA_RESET_PC 0x06
128#define CMD_ISA_ARM_0 0x07
129#define CMD_ISA_ARM_30 0x08
130#define CMD_ISA_ARM_60 0x09
129#define CMD_ISA_DELAY_TIME_2SECS 0x0A 131#define CMD_ISA_DELAY_TIME_2SECS 0x0A
130#define CMD_ISA_DELAY_TIME_4SECS 0x0B 132#define CMD_ISA_DELAY_TIME_4SECS 0x0B
131#define CMD_ISA_DELAY_TIME_8SECS 0x0C 133#define CMD_ISA_DELAY_TIME_8SECS 0x0C
134#define CMD_ISA_RESET_RELAYS 0x0D
132 135
133/* 136/*
134 * We are using an kernel timer to do the pinging of the watchdog 137 * We are using an kernel timer to do the pinging of the watchdog
@@ -473,6 +476,7 @@ static int pcwd_get_status(int *status)
473 if (temp_panic) { 476 if (temp_panic) {
474 printk (KERN_INFO PFX "Temperature overheat trip!\n"); 477 printk (KERN_INFO PFX "Temperature overheat trip!\n");
475 kernel_power_off(); 478 kernel_power_off();
479 /* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
476 } 480 }
477 } 481 }
478 } else { 482 } else {
@@ -484,6 +488,7 @@ static int pcwd_get_status(int *status)
484 if (temp_panic) { 488 if (temp_panic) {
485 printk (KERN_INFO PFX "Temperature overheat trip!\n"); 489 printk (KERN_INFO PFX "Temperature overheat trip!\n");
486 kernel_power_off(); 490 kernel_power_off();
491 /* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
487 } 492 }
488 } 493 }
489 } 494 }
@@ -983,6 +988,8 @@ static void __exit pcwd_cleanup_module(void)
983{ 988{
984 if (pcwd_private.io_addr) 989 if (pcwd_private.io_addr)
985 pcwatchdog_exit(); 990 pcwatchdog_exit();
991
992 printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
986} 993}
987 994
988module_init(pcwd_init_module); 995module_init(pcwd_init_module);