These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / watchdog / dw_wdt.c

diff --git a/kernel/drivers/watchdog/dw_wdt.c b/kernel/drivers/watchdog/dw_wdt.c
index d0bb949..6ea0634 100644 (file)
--- a/kernel/drivers/watchdog/dw_wdt.c
+++ b/kernel/drivers/watchdog/dw_wdt.c
@@ -35,7 +35,6 @@
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
-#include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
@@ -61,7 +60,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
 #define WDT_TIMEOUT            (HZ / 2)
 
 static struct {
-       spinlock_t              lock;
        void __iomem            *regs;
        struct clk              *clk;
        unsigned long           in_use;
@@ -177,7 +175,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)
        /* Make sure we don't get unloaded. */
        __module_get(THIS_MODULE);
 
-       spin_lock(&dw_wdt.lock);
        if (!dw_wdt_is_enabled()) {
                /*
                 * The watchdog is not currently enabled. Set the timeout to
@@ -190,8 +187,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)
 
        dw_wdt_set_next_heartbeat();
 
-       spin_unlock(&dw_wdt.lock);
-
        return nonseekable_open(inode, filp);
 }
 
@@ -220,6 +215,7 @@ static ssize_t dw_wdt_write(struct file *filp, const char __user *buf,
        }
 
        dw_wdt_set_next_heartbeat();
+       dw_wdt_keepalive();
        mod_timer(&dw_wdt.timer, jiffies + WDT_TIMEOUT);
 
        return len;
@@ -348,8 +344,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       spin_lock_init(&dw_wdt.lock);
-
        ret = misc_register(&dw_wdt_miscdev);
        if (ret)
                goto out_disable_clk;