summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/w83977f_wdt.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2007-11-02 00:27:08 +0100
committerWim Van Sebroeck <wim@iguana.be>2007-11-02 20:09:07 +0100
commitc7dfd0cca300c5dc49213cf1c78c77393600410d (patch)
tree5a4a5ecb5ab0215113eacf763a9d15500a02b0ee /drivers/watchdog/w83977f_wdt.c
parent[WATCHDOG] Unlock in iTCO_wdt_start when reboot is disabled (diff)
downloadlinux-c7dfd0cca300c5dc49213cf1c78c77393600410d.tar.xz
linux-c7dfd0cca300c5dc49213cf1c78c77393600410d.zip
[WATCHDOG] spin_lock_init() fixes
Some watchdog drivers initialize global spinlocks in module's init function which is tolerable, but some do it in PCI probe function. So, switch to static initialization to fix theoretical bugs and, more importantly, stop giving people bad examples. Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/w83977f_wdt.c')
-rw-r--r--drivers/watchdog/w83977f_wdt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 157968442891..b475529d2475 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -50,7 +50,7 @@ static int timeoutW; /* timeout in watchdog counter units */
static unsigned long timer_alive;
static int testmode;
static char expect_close;
-static spinlock_t spinlock;
+static DEFINE_SPINLOCK(spinlock);
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (15..7635), default=" __MODULE_STRING(DEFAULT_TIMEOUT) ")");
@@ -476,8 +476,6 @@ static int __init w83977f_wdt_init(void)
printk(KERN_INFO PFX DRIVER_VERSION);
- spin_lock_init(&spinlock);
-
/*
* Check that the timeout value is within it's range ;
* if not reset to the default