[WATCHDOG] Merge code clean-up's from Alan Cox.

[linux-2.6] / drivers / watchdog / sbc_epx_c3.c

diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 82cbd8809a69b0cc863752f43f8fad58a3164bcf..70ff9cbc8e9b4a2aa754b47a3b984c5fc33dbc4b 100644 (file)
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -25,8 +25,8 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 
 #define PFX "epx_c3: "
 static int epx_c3_alive;
@@ -100,12 +100,12 @@ static ssize_t epx_c3_write(struct file *file, const char __user *data,
        return len;
 }
 
-static int epx_c3_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static long epx_c3_ioctl(struct file *file, unsigned int cmd,
+                                               unsigned long arg)
 {
        int options, retval = -EINVAL;
        int __user *argp = (void __user *)arg;
-       static struct watchdog_info ident = {
+       static const struct watchdog_info ident = {
                .options                = WDIOF_KEEPALIVEPING |
                                          WDIOF_MAGICCLOSE,
                .firmware_version       = 0,
@@ -158,7 +158,7 @@ static const struct file_operations epx_c3_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .write          = epx_c3_write,
-       .ioctl          = epx_c3_ioctl,
+       .unlocked_ioctl = epx_c3_ioctl,
        .open           = epx_c3_open,
        .release        = epx_c3_release,
 };