UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans Verkuil 2021-12-14 17:16:36 +01:00 committed by Mauro Carvalho Chehab
parent fa5fce2573
commit 7eba1e4327
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/media/zoran/zoran_card.c
View File

@ -879,7 +879,7 @@ static int zoran_init_video_device(struct zoran *zr, struct video_device *video_
*video_dev = zoran_template; *video_dev = zoran_template;
video_dev->v4l2_dev = &zr->v4l2_dev; video_dev->v4l2_dev = &zr->v4l2_dev;
video_dev->lock = &zr->lock; 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)); strscpy(video_dev->name, ZR_DEVNAME(zr), sizeof(video_dev->name));
/* /*

12
drivers/staging/media/zoran/zoran_driver.c
View File

@ -734,15 +734,6 @@ static int zoran_s_selection(struct file *file, void *__fh, struct v4l2_selectio
return res; 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 * Output is disabled temporarily
* Zoran is picky about jpeg data it accepts. At least it seems to unsupport COM and APPn. * 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 = { static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
.vidioc_querycap = zoran_querycap, .vidioc_querycap = zoran_querycap,
.vidioc_g_parm = zoran_g_parm,
.vidioc_s_selection = zoran_s_selection, .vidioc_s_selection = zoran_s_selection,
.vidioc_g_selection = zoran_g_selection, .vidioc_g_selection = zoran_g_selection,
.vidioc_enum_input = zoran_enum_input, .vidioc_enum_input = zoran_enum_input,
@ -786,8 +776,6 @@ static const struct v4l2_file_operations zoran_fops = {
.unlocked_ioctl = video_ioctl2, .unlocked_ioctl = video_ioctl2,
.open = v4l2_fh_open, .open = v4l2_fh_open,
.release = vb2_fop_release, .release = vb2_fop_release,
.read = vb2_fop_read,
.write = vb2_fop_write,
.mmap = vb2_fop_mmap, .mmap = vb2_fop_mmap,
.poll = vb2_fop_poll, .poll = vb2_fop_poll,
}; };