Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / eurotechwdt.c

diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index 41018d429abb14ff80b0309d2b85bd6f53b745af..3946c51099c07c6fc211658fd0df5aa51a8970bb 100644 (file)
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -64,7 +64,7 @@
 static unsigned long eurwdt_is_open;
 static int eurwdt_timeout;
 static char eur_expect_close;
-static spinlock_t eurwdt_lock;
+static DEFINE_SPINLOCK(eurwdt_lock);
 
 /*
  * You must set these - there is no sane way to probe for this board.
@@ -446,8 +446,6 @@ static int __init eurwdt_init(void)
                goto outreg;
        }
 
-       spin_lock_init(&eurwdt_lock);
-
        ret = misc_register(&eurwdt_miscdev);
        if (ret) {
                printk(KERN_ERR "eurwdt: can't misc_register on minor=%d\n",