1 files changed, 29 insertions, 38 deletions

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 2313fad0dbb1..41264a5f1731 100644
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -22,48 +22,47 @@
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
-
+#include <linux/uaccess.h>
 #include <mach/hardware.h>
-#include <asm/uaccess.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static int heartbeat = 60;      /* (secs) Default is 1 minute */
 static unsigned long wdt_status;
 static unsigned long boot_status;
+static spin_lock_t wdt_lock;
 
 #define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)
 
 #define WDT_IN_USE              0
 #define WDT_OK_TO_CLOSE         1
 
-static void
-wdt_enable(void)
+static void wdt_enable(void)
 {
+        spin_lock(&wdt_lock);
         *IXP4XX_OSWK = IXP4XX_WDT_KEY;
         *IXP4XX_OSWE = 0;
         *IXP4XX_OSWT = WDT_TICK_RATE * heartbeat;
         *IXP4XX_OSWE = IXP4XX_WDT_COUNT_ENABLE | IXP4XX_WDT_RESET_ENABLE;
         *IXP4XX_OSWK = 0;
+        spin_unlock(&wdt_lock);
 }
 
-static void
-wdt_disable(void)
+static void wdt_disable(void)
 {
+        spin_lock(&wdt_lock);
         *IXP4XX_OSWK = IXP4XX_WDT_KEY;
         *IXP4XX_OSWE = 0;
         *IXP4XX_OSWK = 0;
+        spin_unlock(&wdt_lock);
 }
 
-static int
-ixp4xx_wdt_open(struct inode *inode, struct file *file)
+static int ixp4xx_wdt_open(struct inode *inode, struct file *file)
 {
         if (test_and_set_bit(WDT_IN_USE, &wdt_status))
                 return -EBUSY;
 
         clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-
         wdt_enable();
-
         return nonseekable_open(inode, file);
 }
 
@@ -87,7 +86,6 @@ ixp4xx_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
                 }
                 wdt_enable();
         }
-
         return len;
 }
 
@@ -98,9 +96,8 @@ static struct watchdog_info ident = {
 };
 
 
-static int
-ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                        unsigned long arg)
+static long ixp4xx_wdt_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
 {
         int ret = -ENOTTY;
         int time;
@@ -119,6 +116,11 @@ ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 ret = put_user(boot_status, (int *)arg);
                 break;
 
+        case WDIOC_KEEPALIVE:
+                wdt_enable();
+                ret = 0;
+                break;
+
         case WDIOC_SETTIMEOUT:
                 ret = get_user(time, (int *)arg);
                 if (ret)
@@ -136,25 +138,17 @@ ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         case WDIOC_GETTIMEOUT:
                 ret = put_user(heartbeat, (int *)arg);
                 break;
-
-        case WDIOC_KEEPALIVE:
-                wdt_enable();
-                ret = 0;
-                break;
         }
         return ret;
 }
 
-static int
-ixp4xx_wdt_release(struct inode *inode, struct file *file)
+static int ixp4xx_wdt_release(struct inode *inode, struct file *file)
 {
-        if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
+        if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
                 wdt_disable();
-        } else {
+        else
                 printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - "
                                         "timer will not stop\n");
-        }
-
         clear_bit(WDT_IN_USE, &wdt_status);
         clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
 
@@ -162,18 +156,16 @@ ixp4xx_wdt_release(struct inode *inode, struct file *file)
 }
 
 
-static const struct file_operations ixp4xx_wdt_fops =
-{
+static const struct file_operations ixp4xx_wdt_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .write          = ixp4xx_wdt_write,
-        .ioctl          = ixp4xx_wdt_ioctl,
+        .unlocked_ioctl = ixp4xx_wdt_ioctl,
         .open           = ixp4xx_wdt_open,
         .release        = ixp4xx_wdt_release,
 };
 
-static struct miscdevice ixp4xx_wdt_miscdev =
-{
+static struct miscdevice ixp4xx_wdt_miscdev = {
         .minor          = WATCHDOG_MINOR,
         .name           = "watchdog",
         .fops           = &ixp4xx_wdt_fops,
@@ -186,19 +178,18 @@ static int __init ixp4xx_wdt_init(void)
 
         asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :);
         if (!(processor_id & 0xf) && !cpu_is_ixp46x()) {
-                printk("IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected - "
-                        "watchdog disabled\n");
+                printk(KERN_ERR "IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected"
+                        " - watchdog disabled\n");
 
                 return -ENODEV;
         }
-
-        ret = misc_register(&ixp4xx_wdt_miscdev);
-        if (ret == 0)
-                printk("IXP4xx Watchdog Timer: heartbeat %d sec\n", heartbeat);
-
+        spin_lock_init(&wdt_lock);
         boot_status = (*IXP4XX_OSST & IXP4XX_OSST_TIMER_WARM_RESET) ?
                         WDIOF_CARDRESET : 0;
-
+        ret = misc_register(&ixp4xx_wdt_miscdev);
+        if (ret == 0)
+                printk(KERN_INFO "IXP4xx Watchdog Timer: heartbeat %d sec\n",
+                        heartbeat);
         return ret;
 }