lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[WATCHDOG] unlocked_ioctl changes

Browse Source 
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:
Wim Van Sebroeck
2008-09-18 12:26:15 +00:00
parent edf86c9b98
commit 7275fc8c36
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/watchdog/geodewdt.c
View File

@@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data,
return len; return len;
} }
static int geodewdt_ioctl(struct inode *inode, struct file *file, static long geodewdt_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int __user *p = argp; int __user *p = argp;
@@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = geodewdt_write, .write = geodewdt_write,
.ioctl = geodewdt_ioctl, .unlocked_ioctl = geodewdt_ioctl,
.open = geodewdt_open, .open = geodewdt_open,
.release = geodewdt_release, .release = geodewdt_release,
}; };

4
drivers/watchdog/pnx4008_wdt.c
View File

@@ -173,8 +173,8 @@ static const struct watchdog_info ident = {
.identity = "PNX4008 Watchdog", .identity = "PNX4008 Watchdog",
}; };
static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file, static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int ret = -ENOTTY; int ret = -ENOTTY;
int time; int time;

6
drivers/watchdog/rc32434_wdt.c
View File

@@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,
return 0; return 0;
} }
static int rc32434_wdt_ioctl(struct inode *inode, struct file *file, static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int new_timeout; int new_timeout;
@@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = rc32434_wdt_write, .write = rc32434_wdt_write,
.ioctl = rc32434_wdt_ioctl, .unlocked_ioctl = rc32434_wdt_ioctl,
.open = rc32434_wdt_open, .open = rc32434_wdt_open,
.release = rc32434_wdt_release, .release = rc32434_wdt_release,
}; };

6
drivers/watchdog/rdc321x_wdt.c
View File

@@ -144,8 +144,8 @@ static int rdc321x_wdt_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file, static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
unsigned int value; 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 = { static const struct file_operations rdc321x_wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = rdc321x_wdt_ioctl, .unlocked_ioctl = rdc321x_wdt_ioctl,
.open = rdc321x_wdt_open, .open = rdc321x_wdt_open,
.write = rdc321x_wdt_write, .write = rdc321x_wdt_write,
.release = rdc321x_wdt_release, .release = rdc321x_wdt_release,