summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-06-07 16:06:43 -0700
committerWim Van Sebroeck <wim@iguana.be>2007-06-10 19:58:00 +0000
commitc37f271320d595f46beb5a0ab7833107f461f6b6 (patch)
tree2cc682671ee8cf455c105f5776bf165634314eeb
parenta9cb3959ace112295fdb65c99a2928eedba06926 (diff)
downloadblackbird-op-linux-c37f271320d595f46beb5a0ab7833107f461f6b6.tar.gz
blackbird-op-linux-c37f271320d595f46beb5a0ab7833107f461f6b6.zip
[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: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/char/watchdog/at32ap700x_wdt.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/char/watchdog/at32ap700x_wdt.c b/drivers/char/watchdog/at32ap700x_wdt.c
index 036d83bcb50c..588b26d400cd 100644
--- a/drivers/char/watchdog/at32ap700x_wdt.c
+++ b/drivers/char/watchdog/at32ap700x_wdt.c
@@ -16,9 +16,8 @@
#include <linux/fs.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
#define TIMEOUT_MIN 1
#define TIMEOUT_DEFAULT CONFIG_AT32AP700X_WDT_TIMEOUT
@@ -120,7 +119,10 @@ static int at32_wdt_settimeout(int time)
if ((time < TIMEOUT_MIN) || (time > TIMEOUT_MAX))
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;
return 0;
}
@@ -141,7 +143,7 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
void __user *argp = (void __user *)arg;
int __user *p = argp;
- switch(cmd) {
+ switch (cmd) {
case WDIOC_KEEPALIVE:
at32_wdt_pat();
ret = 0;
@@ -182,7 +184,8 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
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();
return len;
OpenPOWER on IntegriCloud