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/ixp2000_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/ixp2000_wdt.c')
-rw-r--r-- | drivers/watchdog/ixp2000_wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c index e86952a7168c..084f71aa855a 100644 --- a/drivers/watchdog/ixp2000_wdt.c +++ b/drivers/watchdog/ixp2000_wdt.c | |||
@@ -32,7 +32,7 @@ | |||
32 | static int nowayout = WATCHDOG_NOWAYOUT; | 32 | static int nowayout = WATCHDOG_NOWAYOUT; |
33 | static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ | 33 | static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ |
34 | static unsigned long wdt_status; | 34 | static unsigned long wdt_status; |
35 | static spinlock_t wdt_lock; | 35 | static DEFINE_SPINLOCK(wdt_lock); |
36 | 36 | ||
37 | #define WDT_IN_USE 0 | 37 | #define WDT_IN_USE 0 |
38 | #define WDT_OK_TO_CLOSE 1 | 38 | #define WDT_OK_TO_CLOSE 1 |
@@ -189,7 +189,6 @@ static int __init ixp2000_wdt_init(void) | |||
189 | return -EIO; | 189 | return -EIO; |
190 | } | 190 | } |
191 | wdt_tick_rate = (*IXP2000_T1_CLD * HZ) / 256; | 191 | wdt_tick_rate = (*IXP2000_T1_CLD * HZ) / 256; |
192 | spin_lock_init(&wdt_lock); | ||
193 | return misc_register(&ixp2000_wdt_miscdev); | 192 | return misc_register(&ixp2000_wdt_miscdev); |
194 | } | 193 | } |
195 | 194 | ||