1 files changed, 32 insertions, 31 deletions

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 566343b3c131..1e013e8457b7 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -5,10 +5,10 @@
  * interface and Solaris-compatible ioctls as best it is
  * able.
  *
- * NOTE:        CP1400 systems appear to have a defective intr_mask
- *                      register on the PLD, preventing the disabling of
- *                      timer interrupts.  We use a timer to periodically
- *                      reset 'stopped' watchdogs on affected platforms.
+ * NOTE:        CP1400 systems appear to have a defective intr_mask
+ *                      register on the PLD, preventing the disabling of
+ *                      timer interrupts.  We use a timer to periodically
+ *                      reset 'stopped' watchdogs on affected platforms.
  *
  * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
@@ -25,7 +25,7 @@
 #include <linux/ioport.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -89,6 +89,7 @@ struct cpwd {
         } devs[WD_NUMDEVS];
 };
 
+static DEFINE_MUTEX(cpwd_mutex);
 static struct cpwd *cpwd_device;
 
 /* Sun uses Altera PLD EPF8820ATC144-4
@@ -106,13 +107,13 @@ static struct cpwd *cpwd_device;
  * -------------------
  * |-  counter val  -|
  * -------------------
- * dcntr -      Current 16-bit downcounter value.
- *                      When downcounter reaches '0' watchdog expires.
- *                      Reading this register resets downcounter with
- *                      'limit' value.
- * limit -      16-bit countdown value in 1/10th second increments.
- *                      Writing this register begins countdown with input value.
- *                      Reading from this register does not affect counter.
+ * dcntr -      Current 16-bit downcounter value.
+ *                      When downcounter reaches '0' watchdog expires.
+ *                      Reading this register resets downcounter with
+ *                      'limit' value.
+ * limit -      16-bit countdown value in 1/10th second increments.
+ *                      Writing this register begins countdown with input value.
+ *                      Reading from this register does not affect counter.
  * NOTES:       After watchdog reset, dcntr and limit contain '1'
  *
  * status register (byte access):
@@ -122,7 +123,7 @@ static struct cpwd *cpwd_device;
  * |-   UNUSED  -| EXP | RUN |
  * ---------------------------
  * status-      Bit 0 - Watchdog is running
- *                      Bit 1 - Watchdog has expired
+ *                      Bit 1 - Watchdog has expired
  *
  *** PLD register block definition (struct wd_pld_regblk)
  *
@@ -196,7 +197,7 @@ static u8 cpwd_readb(void __iomem *addr)
  * Because of the CP1400 defect this should only be
  * called during initialzation or by wd_[start|stop]timer()
  *
- * index        - sub-device index, or -1 for 'all'
+ * index        - sub-device index, or -1 for 'all'
  * enable       - non-zero to enable interrupts, zero to disable
  */
 static void cpwd_toggleintr(struct cpwd *p, int index, int enable)
@@ -316,13 +317,13 @@ static int cpwd_getstatus(struct cpwd *p, int index)
                 } else {
                         /* Fudge WD_EXPIRED status for defective CP1400--
                          * IF timer is running
-                         *      AND brokenstop is set
-                         *      AND an interrupt has been serviced
+                         *      AND brokenstop is set
+                         *      AND an interrupt has been serviced
                          * we are WD_EXPIRED.
                          *
                          * IF timer is running
-                         *      AND brokenstop is set
-                         *      AND no interrupt has been serviced
+                         *      AND brokenstop is set
+                         *      AND no interrupt has been serviced
                          * we are WD_FREERUN.
                          */
                         if (p->broken &&
@@ -368,7 +369,7 @@ static int cpwd_open(struct inode *inode, struct file *f)
 {
         struct cpwd *p = cpwd_device;
 
-        lock_kernel();
+        mutex_lock(&cpwd_mutex);
         switch (iminor(inode)) {
         case WD0_MINOR:
         case WD1_MINOR:
@@ -376,7 +377,7 @@ static int cpwd_open(struct inode *inode, struct file *f)
                 break;
 
         default:
-                unlock_kernel();
+                mutex_unlock(&cpwd_mutex);
                 return -ENODEV;
         }
 
@@ -386,13 +387,13 @@ static int cpwd_open(struct inode *inode, struct file *f)
                                 IRQF_SHARED, DRIVER_NAME, p)) {
                         printk(KERN_ERR PFX "Cannot register IRQ %d\n",
                                 p->irq);
-                        unlock_kernel();
+                        mutex_unlock(&cpwd_mutex);
                         return -EBUSY;
                 }
                 p->initialized = true;
         }
 
-        unlock_kernel();
+        mutex_unlock(&cpwd_mutex);
 
         return nonseekable_open(inode, f);
 }
@@ -482,9 +483,9 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
         case WIOCSTART:
         case WIOCSTOP:
         case WIOCGSTAT:
-                lock_kernel();
+                mutex_lock(&cpwd_mutex);
                 rval = cpwd_ioctl(file, cmd, arg);
-                unlock_kernel();
+                mutex_unlock(&cpwd_mutex);
                 break;
 
         /* everything else is handled by the generic compat layer */
@@ -524,10 +525,10 @@ static const struct file_operations cpwd_fops = {
         .write =                cpwd_write,
         .read =                 cpwd_read,
         .release =              cpwd_release,
+        .llseek =               no_llseek,
 };
 
-static int __devinit cpwd_probe(struct platform_device *op,
-                                const struct of_device_id *match)
+static int __devinit cpwd_probe(struct platform_device *op)
 {
         struct device_node *options;
         const char *str_prop;
@@ -612,7 +613,7 @@ static int __devinit cpwd_probe(struct platform_device *op,
 
         if (p->broken) {
                 init_timer(&cpwd_timer);
-                cpwd_timer.function     = cpwd_brokentimer;
+                cpwd_timer.function     = cpwd_brokentimer;
                 cpwd_timer.data         = (unsigned long) p;
                 cpwd_timer.expires      = WD_BTIMEOUT;
 
@@ -644,7 +645,7 @@ static int __devexit cpwd_remove(struct platform_device *op)
         struct cpwd *p = dev_get_drvdata(&op->dev);
         int i;
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < WD_NUMDEVS; i++) {
                 misc_deregister(&p->devs[i].misc);
 
                 if (!p->enabled) {
@@ -676,7 +677,7 @@ static const struct of_device_id cpwd_match[] = {
 };
 MODULE_DEVICE_TABLE(of, cpwd_match);
 
-static struct of_platform_driver cpwd_driver = {
+static struct platform_driver cpwd_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -688,12 +689,12 @@ static struct of_platform_driver cpwd_driver = {
 
 static int __init cpwd_init(void)
 {
-        return of_register_platform_driver(&cpwd_driver);
+        return platform_driver_register(&cpwd_driver);
 }
 
 static void __exit cpwd_exit(void)
 {
-        of_unregister_platform_driver(&cpwd_driver);
+        platform_driver_unregister(&cpwd_driver);
 }
 
 module_init(cpwd_init);