[WATCHDOG] unlocked_ioctl changes
Fix some drivers so that they use the unlocked_ioctl call. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
edf86c9b98
commit
7275fc8c36
|
@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data,
|
|||
return len;
|
||||
}
|
||||
|
||||
static int geodewdt_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
static long geodewdt_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
int __user *p = argp;
|
||||
|
@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = {
|
|||
.owner = THIS_MODULE,
|
||||
.llseek = no_llseek,
|
||||
.write = geodewdt_write,
|
||||
.ioctl = geodewdt_ioctl,
|
||||
.unlocked_ioctl = geodewdt_ioctl,
|
||||
.open = geodewdt_open,
|
||||
.release = geodewdt_release,
|
||||
};
|
||||
|
|
|
@ -173,8 +173,8 @@ static const struct watchdog_info ident = {
|
|||
.identity = "PNX4008 Watchdog",
|
||||
};
|
||||
|
||||
static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
int ret = -ENOTTY;
|
||||
int time;
|
||||
|
|
|
@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rc32434_wdt_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
int new_timeout;
|
||||
|
@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = {
|
|||
.owner = THIS_MODULE,
|
||||
.llseek = no_llseek,
|
||||
.write = rc32434_wdt_write,
|
||||
.ioctl = rc32434_wdt_ioctl,
|
||||
.unlocked_ioctl = rc32434_wdt_ioctl,
|
||||
.open = rc32434_wdt_open,
|
||||
.release = rc32434_wdt_release,
|
||||
};
|
||||
|
|
|
@ -144,8 +144,8 @@ static int rdc321x_wdt_release(struct inode *inode, struct file *file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
unsigned int value;
|
||||
|
@ -204,7 +204,7 @@ static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
|
|||
static const struct file_operations rdc321x_wdt_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = no_llseek,
|
||||
.ioctl = rdc321x_wdt_ioctl,
|
||||
.unlocked_ioctl = rdc321x_wdt_ioctl,
|
||||
.open = rdc321x_wdt_open,
|
||||
.write = rdc321x_wdt_write,
|
||||
.release = rdc321x_wdt_release,
|
||||
|
|
Loading…
Reference in New Issue