pcwd: A couple of watchdogs escaped conversion
PATCH 1/1 pcwd: A couple of watchdogs escaped conversion
Fix them up. Once we know the long term plan the watchdogs can all get shrunk massively anyway
Signed-off-by Alan Cox <[email protected]>
drivers/watchdog/pcwd_pci.c +3 -5
@@ -455,8 +455,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data,return len; } -static int pcipcwd_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg) +static long pcipcwd_ioctl (struct file *file,unsigned int cmd, +unsigned long arg) {void __user *argp = (void __user *)arg;int __user *p = argp;
@@ -478,9 +478,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,case WDIOC_GETSTATUS : {int status; -pcipcwd_get_status (&status); -return put_user (status, p); }
@@ -644,7 +642,7 @@ static const struct file_operations pcipcwd_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .write = pcipcwd_write, - .ioctl = pcipcwd_ioctl, + .unlocked_ioctl = pcipcwd_ioctl, .open = pcipcwd_open, .release = pcipcwd_release, };
drivers/watchdog/pcwd_usb.c +3 -3
@@ -369,8 +369,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,return len; } -static int usb_pcwd_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg) +static long usb_pcwd_ioctl (struct file *file,unsigned int cmd, +unsigned long arg) {void __user *argp = (void __user *)arg;int __user *p = argp;
@@ -535,7 +535,7 @@ static const struct file_operations usb_pcwd_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .write = usb_pcwd_write, - .ioctl = usb_pcwd_ioctl, + .unlocked_ioctl = usb_pcwd_ioctl, .open = usb_pcwd_open, .release = usb_pcwd_release, };