summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/geodewdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2008-09-18 14:26:15 +0200
committerWim Van Sebroeck <wim@iguana.be>2008-09-23 10:12:30 +0200
commit7275fc8c36dbad3a871f82b1f9f1f524688176ea (patch)
treea232bba6b12be48ec644ebdb0d11fb34fa020fa6 /drivers/watchdog/geodewdt.c
parent[WATCHDOG] wdt285: fix sparse warnings (diff)
downloadlinux-7275fc8c36dbad3a871f82b1f9f1f524688176ea.tar.xz
linux-7275fc8c36dbad3a871f82b1f9f1f524688176ea.zip
[WATCHDOG] unlocked_ioctl changes
Fix some drivers so that they use the unlocked_ioctl call. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/geodewdt.c')
-rw-r--r--drivers/watchdog/geodewdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 614a5c7017b6..6799a6de66fe 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -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,
};