diff options
| author | Alan Cox <alan@redhat.com> | 2008-05-19 14:08:49 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-06-21 15:35:02 +0000 |
| commit | 9b748ed03cabf533a815e5ffc50108a21c98e40c (patch) | |
| tree | fae47835f3cee807e491f2156c45132f20fd80a6 /drivers/watchdog/sc520_wdt.c | |
| parent | ff94806057fba557abd6295f7313f5f9e972a48f (diff) | |
| download | op-kernel-dev-9b748ed03cabf533a815e5ffc50108a21c98e40c.zip op-kernel-dev-9b748ed03cabf533a815e5ffc50108a21c98e40c.tar.gz | |
[WATCHDOG 44/57] scx200_wdt: clean up and 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/sc520_wdt.c')
| -rw-r--r-- | drivers/watchdog/sc520_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c index 525555a..01de239 100644 --- a/drivers/watchdog/sc520_wdt.c +++ b/drivers/watchdog/sc520_wdt.c @@ -279,7 +279,7 @@ static int fop_close(struct inode *inode, struct file *file) return 0; } -static int fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { void __user *argp = (void __user *)arg; int __user *p = argp; @@ -345,7 +345,7 @@ static const struct file_operations wdt_fops = { .write = fop_write, .open = fop_open, .release = fop_close, - .ioctl = fop_ioctl, + .unlocked_ioctl = fop_ioctl, }; static struct miscdevice wdt_miscdev = { |
