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

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

[media] cx18: don't mess with vfd->debug 



This is now controlled by sysfs.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 074689d6

drivers/media/video/cx18/cx18-ioctl.c

+0 −18
Original line number Diff line number Diff line
@@ -1142,24 +1142,6 @@ static long cx18_default(struct file *file, void *fh, bool valid_prio, 
	return 0;

}



long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd,

		    unsigned long arg)

{

	struct video_device *vfd = video_devdata(filp);

	struct cx18_open_id *id = file2id(filp);

	struct cx18 *cx = id->cx;

	long res;



	mutex_lock(&cx->serialize_lock);



	if (cx18_debug & CX18_DBGFLG_IOCTL)

		vfd->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;

	res = video_ioctl2(filp, cmd, arg);

	vfd->debug = 0;

	mutex_unlock(&cx->serialize_lock);

	return res;

}



static const struct v4l2_ioctl_ops cx18_ioctl_ops = {

	.vidioc_querycap                = cx18_querycap,

	.vidioc_s_audio                 = cx18_s_audio,

drivers/media/video/cx18/cx18-ioctl.h

+0 −2
Original line number Diff line number Diff line
@@ -29,5 +29,3 @@ void cx18_set_funcs(struct video_device *vdev); 
int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std);

int cx18_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf);

int cx18_s_input(struct file *file, void *fh, unsigned int inp);
 
long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd,

		    unsigned long arg);

drivers/media/video/cx18/cx18-streams.c

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = { 
	.owner = THIS_MODULE,

	.read = cx18_v4l2_read,

	.open = cx18_v4l2_open,

	/* FIXME change to video_ioctl2 if serialization lock can be removed */

	.unlocked_ioctl = cx18_v4l2_ioctl,

	.unlocked_ioctl = video_ioctl2,

	.release = cx18_v4l2_close,

	.poll = cx18_v4l2_enc_poll,

	.mmap = cx18_v4l2_mmap,
@@ -376,6 +375,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type) 
	s->video_dev->fops = &cx18_v4l2_enc_fops;

	s->video_dev->release = video_device_release;

	s->video_dev->tvnorms = V4L2_STD_ALL;

	s->video_dev->lock = &cx->serialize_lock;

	set_bit(V4L2_FL_USE_FH_PRIO, &s->video_dev->flags);

	cx18_set_funcs(s->video_dev);

	return 0;