diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-11-29 00:54:01 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-01-06 09:17:17 -0500 |
commit | 1334f32938e46fb321c67a652997d33583257249 (patch) | |
tree | f296005ef79641ea4733af19cda0f5bf736824b1 /drivers/watchdog/ks8695_wdt.c | |
parent | 216f3ad9aa5731024b9c96e63b676f9f65078dd5 (diff) |
watchdog: Use DEFINE_SPINLOCK() for static spinlocks
Rather than just defining static spinlock_t variables and then
initializing them later in init functions, simply define them with
DEFINE_SPINLOCK() and remove the calls to spin_lock_init().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Nicolas Thill <nico@openwrt.org>
Cc: Heiko Ronsdorf <hero@ihg.uni-duisburg.de>
Cc: Rodolfo Giometti <giometti@ascensit.com>
Cc: Andrey Panin <pazke@donpac.ru>
Cc: Guido Guenther <agx@sigxcpu.org>
Cc: Curt E Bruns <curt.e.bruns@intel.com>
Cc: Deepak Saxena <dsaxena@plexity.net>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: George G. Davis <gdavis@mvista.com>
Cc: Sylver Bruneau <sylver.bruneau@googlemail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ks8695_wdt.c')
-rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 811471903e8a..51757a520e8f 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c | |||
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | |||
42 | 42 | ||
43 | 43 | ||
44 | static unsigned long ks8695wdt_busy; | 44 | static unsigned long ks8695wdt_busy; |
45 | static spinlock_t ks8695_lock; | 45 | static DEFINE_SPINLOCK(ks8695_lock); |
46 | 46 | ||
47 | /* ......................................................................... */ | 47 | /* ......................................................................... */ |
48 | 48 | ||
@@ -288,7 +288,6 @@ static struct platform_driver ks8695wdt_driver = { | |||
288 | 288 | ||
289 | static int __init ks8695_wdt_init(void) | 289 | static int __init ks8695_wdt_init(void) |
290 | { | 290 | { |
291 | spin_lock_init(&ks8695_lock); | ||
292 | /* Check that the heartbeat value is within range; | 291 | /* Check that the heartbeat value is within range; |
293 | if not reset to the default */ | 292 | if not reset to the default */ |
294 | if (ks8695_wdt_settimeout(wdt_time)) { | 293 | if (ks8695_wdt_settimeout(wdt_time)) { |