diff options
| author | Alan Cox <alan@redhat.com> | 2008-05-19 14:08:27 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-06-21 14:46:05 +0000 |
| commit | f4f6f65a554d4a11e544070c39eea7c2ecc3ebfb (patch) | |
| tree | 0373aa4ee0c94e2269c4ddba77751bbee85b6eb7 /drivers/watchdog/sbc_epx_c3.c | |
| parent | 9f53c8de1aef08cad678dcda0f85fd8914ad7666 (diff) | |
| download | linux-f4f6f65a554d4a11e544070c39eea7c2ecc3ebfb.tar.gz | |
[WATCHDOG 40/57] sbc_epx_c3_wdt: switch to unlocked_ioctl
Review and switch to unlocked_ioctl Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/sbc_epx_c3.c')
| -rw-r--r-- | drivers/watchdog/sbc_epx_c3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 82cbd8809a69..70ff9cbc8e9b 100644 --- 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, }; |