aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/sc520_wdt.c
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-05-19 09:08:49 -0400
committerWim Van Sebroeck <wim@iguana.be>2008-06-21 11:35:02 -0400
commit9b748ed03cabf533a815e5ffc50108a21c98e40c (patch)
treefae47835f3cee807e491f2156c45132f20fd80a6 /drivers/watchdog/sc520_wdt.c
parentff94806057fba557abd6295f7313f5f9e972a48f (diff)
[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index 525555a8779c..01de239f49e8 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)
279 return 0; 279 return 0;
280} 280}
281 281
282static int fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 282static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
283{ 283{
284 void __user *argp = (void __user *)arg; 284 void __user *argp = (void __user *)arg;
285 int __user *p = argp; 285 int __user *p = argp;
@@ -345,7 +345,7 @@ static const struct file_operations wdt_fops = {
345 .write = fop_write, 345 .write = fop_write,
346 .open = fop_open, 346 .open = fop_open,
347 .release = fop_close, 347 .release = fop_close,
348 .ioctl = fop_ioctl, 348 .unlocked_ioctl = fop_ioctl,
349}; 349};
350 350
351static struct miscdevice wdt_miscdev = { 351static struct miscdevice wdt_miscdev = {