Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9488520 authored by Alan Cox's avatar Alan Cox Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] 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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 089ab079

drivers/watchdog/pcwd_pci.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -454,8 +454,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data, 
	return len;

	return len;

}

}





static int pcipcwd_ioctl(struct inode *inode, struct file *file,

static long pcipcwd_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;
@@ -477,9 +477,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file, 
		case WDIOC_GETSTATUS:

		case WDIOC_GETSTATUS:

		{

		{

			int status;

			int status;



			pcipcwd_get_status(&status);

			pcipcwd_get_status(&status);



			return put_user(status, p);

			return put_user(status, p);

		}

		}
@@ -643,7 +641,7 @@ static const struct file_operations pcipcwd_fops = { 
	.owner =	THIS_MODULE,

	.owner =	THIS_MODULE,

	.llseek =	no_llseek,

	.llseek =	no_llseek,

	.write =	pcipcwd_write,

	.write =	pcipcwd_write,

	.ioctl =	pcipcwd_ioctl,

	.unlocked_ioctl = pcipcwd_ioctl,

	.open =		pcipcwd_open,

	.open =		pcipcwd_open,

	.release =	pcipcwd_release,

	.release =	pcipcwd_release,

};

};

drivers/watchdog/pcwd_usb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -368,8 +368,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data, 
	return len;

	return len;

}

}





static int usb_pcwd_ioctl(struct inode *inode, struct file *file,

static long usb_pcwd_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;
@@ -534,7 +534,7 @@ static const struct file_operations usb_pcwd_fops = { 
	.owner =	THIS_MODULE,

	.owner =	THIS_MODULE,

	.llseek =	no_llseek,

	.llseek =	no_llseek,

	.write =	usb_pcwd_write,

	.write =	usb_pcwd_write,

	.ioctl =	usb_pcwd_ioctl,

	.unlocked_ioctl = usb_pcwd_ioctl,

	.open =		usb_pcwd_open,

	.open =		usb_pcwd_open,

	.release =	usb_pcwd_release,

	.release =	usb_pcwd_release,

};

};