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

media: staging: media: zoran: drop read/write support 



This makes no sense for MJPEG formats and it is just easier to
drop support for this altogether.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent fa5fce25

drivers/staging/media/zoran/zoran_card.c

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static int zoran_init_video_device(struct zoran *zr, struct video_device *video_ 
	*video_dev = zoran_template;

	video_dev->v4l2_dev = &zr->v4l2_dev;

	video_dev->lock = &zr->lock;

	video_dev->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE | dir;

	video_dev->device_caps = V4L2_CAP_STREAMING | dir;



	strscpy(video_dev->name, ZR_DEVNAME(zr), sizeof(video_dev->name));

	/*

drivers/staging/media/zoran/zoran_driver.c

+0 −12
Original line number Diff line number Diff line
@@ -734,15 +734,6 @@ static int zoran_s_selection(struct file *file, void *__fh, struct v4l2_selectio 
	return res;

}



static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm)

{

	if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	parm->parm.capture.readbuffers = 9;

	return 0;

}



/*

 * Output is disabled temporarily

 * Zoran is picky about jpeg data it accepts. At least it seems to unsupport COM and APPn.
@@ -750,7 +741,6 @@ static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *p 
 */

static const struct v4l2_ioctl_ops zoran_ioctl_ops = {

	.vidioc_querycap		    = zoran_querycap,

	.vidioc_g_parm			    = zoran_g_parm,

	.vidioc_s_selection		    = zoran_s_selection,

	.vidioc_g_selection		    = zoran_g_selection,

	.vidioc_enum_input		    = zoran_enum_input,
@@ -786,8 +776,6 @@ static const struct v4l2_file_operations zoran_fops = { 
	.unlocked_ioctl = video_ioctl2,

	.open		= v4l2_fh_open,

	.release	= vb2_fop_release,

	.read		= vb2_fop_read,

	.write		= vb2_fop_write,

	.mmap		= vb2_fop_mmap,

	.poll		= vb2_fop_poll,

};