Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c
index e86952a7168c8b247ea5e9252c1977ba38bde94f..084f71aa855a7a7599359d081ca30478386998ef 100644 (file)
--- a/drivers/watchdog/ixp2000_wdt.c
+++ b/drivers/watchdog/ixp2000_wdt.c
@@ -32,7 +32,7 @@
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned int heartbeat = 60;    /* (secs) Default is 1 minute */
 static unsigned long wdt_status;
-static spinlock_t wdt_lock;
+static DEFINE_SPINLOCK(wdt_lock);
 
 #define        WDT_IN_USE              0
 #define        WDT_OK_TO_CLOSE         1
@@ -189,7 +189,6 @@ static int __init ixp2000_wdt_init(void)
                return -EIO;
        }
        wdt_tick_rate = (*IXP2000_T1_CLD * HZ) / 256;
-       spin_lock_init(&wdt_lock);
        return misc_register(&ixp2000_wdt_miscdev);
 }