Commit c37f2713 authored by Andrew Morton's avatar Andrew Morton Committed by Wim Van Sebroeck

[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix

little fiddles.

Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a9cb3959
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/uaccess.h>
#include <asm/uaccess.h> #include <linux/io.h>
#include <asm/io.h>
#define TIMEOUT_MIN 1 #define TIMEOUT_MIN 1
#define TIMEOUT_DEFAULT CONFIG_AT32AP700X_WDT_TIMEOUT #define TIMEOUT_DEFAULT CONFIG_AT32AP700X_WDT_TIMEOUT
...@@ -120,7 +119,10 @@ static int at32_wdt_settimeout(int time) ...@@ -120,7 +119,10 @@ static int at32_wdt_settimeout(int time)
if ((time < TIMEOUT_MIN) || (time > TIMEOUT_MAX)) if ((time < TIMEOUT_MIN) || (time > TIMEOUT_MAX))
return -EINVAL; return -EINVAL;
/* Set new watchdog time. It will be used when at32_wdt_start() is called. */ /*
* Set new watchdog time. It will be used when at32_wdt_start() is
* called.
*/
wdt->timeout = time; wdt->timeout = time;
return 0; return 0;
} }
...@@ -141,7 +143,7 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file, ...@@ -141,7 +143,7 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int __user *p = argp; int __user *p = argp;
switch(cmd) { switch (cmd) {
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
at32_wdt_pat(); at32_wdt_pat();
ret = 0; ret = 0;
...@@ -182,7 +184,8 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file, ...@@ -182,7 +184,8 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
return ret; return ret;
} }
static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos) static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
{ {
at32_wdt_pat(); at32_wdt_pat();
return len; return len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment