mirror of
https://github.com/torvalds/linux.git
synced 2024-10-27 07:16:27 +00:00
[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>
This commit is contained in:
parent
9f53c8de1a
commit
f4f6f65a55
|
@ -25,8 +25,8 @@
|
||||||
#include <linux/reboot.h>
|
#include <linux/reboot.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <asm/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
#include <asm/io.h>
|
#include <linux/io.h>
|
||||||
|
|
||||||
#define PFX "epx_c3: "
|
#define PFX "epx_c3: "
|
||||||
static int epx_c3_alive;
|
static int epx_c3_alive;
|
||||||
|
@ -100,12 +100,12 @@ static ssize_t epx_c3_write(struct file *file, const char __user *data,
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int epx_c3_ioctl(struct inode *inode, struct file *file,
|
static long epx_c3_ioctl(struct file *file, unsigned int cmd,
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
int options, retval = -EINVAL;
|
int options, retval = -EINVAL;
|
||||||
int __user *argp = (void __user *)arg;
|
int __user *argp = (void __user *)arg;
|
||||||
static struct watchdog_info ident = {
|
static const struct watchdog_info ident = {
|
||||||
.options = WDIOF_KEEPALIVEPING |
|
.options = WDIOF_KEEPALIVEPING |
|
||||||
WDIOF_MAGICCLOSE,
|
WDIOF_MAGICCLOSE,
|
||||||
.firmware_version = 0,
|
.firmware_version = 0,
|
||||||
|
@ -158,7 +158,7 @@ static const struct file_operations epx_c3_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.llseek = no_llseek,
|
.llseek = no_llseek,
|
||||||
.write = epx_c3_write,
|
.write = epx_c3_write,
|
||||||
.ioctl = epx_c3_ioctl,
|
.unlocked_ioctl = epx_c3_ioctl,
|
||||||
.open = epx_c3_open,
|
.open = epx_c3_open,
|
||||||
.release = epx_c3_release,
|
.release = epx_c3_release,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user