summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/indydog.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-11-29 00:54:01 -0500
committerWim Van Sebroeck <wim@iguana.be>2012-01-06 09:17:17 -0500
commit1334f32938e46fb321c67a652997d33583257249 (patch)
treef296005ef79641ea4733af19cda0f5bf736824b1 /drivers/watchdog/indydog.c
parent216f3ad9aa5731024b9c96e63b676f9f65078dd5 (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/indydog.c')
-rw-r--r--drivers/watchdog/indydog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 1cc5609666d1..1475e09f9af2 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -28,7 +28,7 @@
28 28
29#define PFX "indydog: " 29#define PFX "indydog: "
30static unsigned long indydog_alive; 30static unsigned long indydog_alive;
31static spinlock_t indydog_lock; 31static DEFINE_SPINLOCK(indydog_lock);
32 32
33#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ 33#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
34 34
@@ -185,8 +185,6 @@ static int __init watchdog_init(void)
185{ 185{
186 int ret; 186 int ret;
187 187
188 spin_lock_init(&indydog_lock);
189
190 ret = register_reboot_notifier(&indydog_notifier); 188 ret = register_reboot_notifier(&indydog_notifier);
191 if (ret) { 189 if (ret) {
192 printk(KERN_ERR PFX 190 printk(KERN_ERR PFX