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

Commit f473bf76 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9503): v4l: remove inode argument from video_usercopy 



The inode argument was never used. Removing it from video_usercopy
brings the function pointer type of video_usercopy in line with similar
v4l2 functions, thus simplifying several drivers.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bef216b7

drivers/media/common/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
/*

	DEB_EE(("inode:%p, file:%p, cmd:%d, arg:%li\n",inode, file, cmd, arg));

*/

	return video_usercopy(inode, file, cmd, arg, saa7146_video_do_ioctl);

	return video_usercopy(file, cmd, arg, saa7146_video_do_ioctl);

}



static int fops_mmap(struct file *file, struct vm_area_struct * vma)

drivers/media/common/saa7146_video.c

+2 −8
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file) 
 * copying is done already, arg is a kernel pointer.

 */



static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)

int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)

{

	struct saa7146_fh *fh  = file->private_data;

	struct saa7146_dev *dev = fh->dev;
@@ -1216,17 +1216,11 @@ static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *a 
#endif

	default:

		return v4l_compat_translate_ioctl(file, cmd, arg,

						  __saa7146_video_do_ioctl);

						  saa7146_video_do_ioctl);

	}

	return 0;

}



int saa7146_video_do_ioctl(struct inode *inode, struct file *file,

				    unsigned int cmd, void *arg)

{

	return __saa7146_video_do_ioctl(file, cmd, arg);

}



/*********************************************************************************/

/* buffer handling functions                                                  */

drivers/media/video/arv.c

+2 −3
Original line number Diff line number Diff line
@@ -396,8 +396,7 @@ out_up: 
	return ret;

}



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

		       unsigned int cmd, void *arg)

static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg)

{

	struct video_device *dev = video_devdata(file);

	struct ar_device *ar = video_get_drvdata(dev);
@@ -543,7 +542,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file, 
static int ar_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

		    unsigned long arg)

{

	return video_usercopy(inode, file, cmd, arg, ar_do_ioctl);

	return video_usercopy(file, cmd, arg, ar_do_ioctl);

}



#if USE_INT

drivers/media/video/bw-qcam.c

+2 −3
Original line number Diff line number Diff line
@@ -706,8 +706,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l 
 *	Video4linux interfacing

 */



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

			 unsigned int cmd, void *arg)

static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)

{

	struct video_device *dev = video_devdata(file);

	struct qcam_device *qcam=(struct qcam_device *)dev;
@@ -867,7 +866,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file, 
static int qcam_ioctl(struct inode *inode, struct file *file,

		     unsigned int cmd, unsigned long arg)

{

	return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl);

	return video_usercopy(file, cmd, arg, qcam_do_ioctl);

}



static ssize_t qcam_read(struct file *file, char __user *buf,

drivers/media/video/c-qcam.c

+3 −4
Original line number Diff line number Diff line
@@ -500,8 +500,7 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le 
 *	Video4linux interfacing

 */



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

			 unsigned int cmd, void *arg)

static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)

{

	struct video_device *dev = video_devdata(file);

	struct qcam_device *qcam=(struct qcam_device *)dev;
@@ -669,7 +668,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file, 
static int qcam_ioctl(struct inode *inode, struct file *file,

		      unsigned int cmd, unsigned long arg)

{

	return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl);

	return video_usercopy(file, cmd, arg, qcam_do_ioctl);

}



static ssize_t qcam_read(struct file *file, char __user *buf,