Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / watchdog / iop_wdt.c

diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index 0c90596766907cb8acf686c447a280341703832b..82fa7a92a8d280b7f439489dd43ac70e97e5b86d 100644 (file)
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -37,7 +37,7 @@
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned long wdt_status;
 static unsigned long boot_status;
-static spinlock_t wdt_lock;
+static DEFINE_SPINLOCK(wdt_lock);
 
 #define WDT_IN_USE             0
 #define WDT_OK_TO_CLOSE                1
@@ -139,7 +139,7 @@ static long iop_wdt_ioctl(struct file *file,
 
        switch (cmd) {
        case WDIOC_GETSUPPORT:
-               if (copy_to_user(argp, &ident, sizeof ident))
+               if (copy_to_user(argp, &ident, sizeof(ident)))
                        ret = -EFAULT;
                else
                        ret = 0;
@@ -226,9 +226,6 @@ static int __init iop_wdt_init(void)
 {
        int ret;
 
-       spin_lock_init(&wdt_lock);
-
-
        /* check if the reset was caused by the watchdog timer */
        boot_status = (read_rcsr() & IOP_RCSR_WDT) ? WDIOF_CARDRESET : 0;