diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-24 08:33:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:07 -0500 |
commit | 08af245de0cf6ab5f4ed008ee2bb99273774fce0 (patch) | |
tree | d07a9b38eb4b9442ef0e935063a5f7f40248e19e /drivers/media/video/cx23885 | |
parent | b69a219e0e97441dbeb0262cf85468b61a161399 (diff) |
[media] V4L: remove V4L1 compatibility mode
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 8b2fb8a4375c..796a797b5205 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -1024,35 +1024,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, | |||
1024 | return 0; | 1024 | return 0; |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1028 | static int vidiocgmbuf(struct file *file, void *priv, | ||
1029 | struct video_mbuf *mbuf) | ||
1030 | { | ||
1031 | struct cx23885_fh *fh = priv; | ||
1032 | struct videobuf_queue *q; | ||
1033 | struct v4l2_requestbuffers req; | ||
1034 | unsigned int i; | ||
1035 | int err; | ||
1036 | |||
1037 | q = get_queue(fh); | ||
1038 | memset(&req, 0, sizeof(req)); | ||
1039 | req.type = q->type; | ||
1040 | req.count = 8; | ||
1041 | req.memory = V4L2_MEMORY_MMAP; | ||
1042 | err = videobuf_reqbufs(q, &req); | ||
1043 | if (err < 0) | ||
1044 | return err; | ||
1045 | |||
1046 | mbuf->frames = req.count; | ||
1047 | mbuf->size = 0; | ||
1048 | for (i = 0; i < mbuf->frames; i++) { | ||
1049 | mbuf->offsets[i] = q->bufs[i]->boff; | ||
1050 | mbuf->size += q->bufs[i]->bsize; | ||
1051 | } | ||
1052 | return 0; | ||
1053 | } | ||
1054 | #endif | ||
1055 | |||
1056 | static int vidioc_reqbufs(struct file *file, void *priv, | 1027 | static int vidioc_reqbufs(struct file *file, void *priv, |
1057 | struct v4l2_requestbuffers *p) | 1028 | struct v4l2_requestbuffers *p) |
1058 | { | 1029 | { |
@@ -1427,9 +1398,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1427 | .vidioc_s_ctrl = vidioc_s_ctrl, | 1398 | .vidioc_s_ctrl = vidioc_s_ctrl, |
1428 | .vidioc_streamon = vidioc_streamon, | 1399 | .vidioc_streamon = vidioc_streamon, |
1429 | .vidioc_streamoff = vidioc_streamoff, | 1400 | .vidioc_streamoff = vidioc_streamoff, |
1430 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1431 | .vidiocgmbuf = vidiocgmbuf, | ||
1432 | #endif | ||
1433 | .vidioc_g_tuner = vidioc_g_tuner, | 1401 | .vidioc_g_tuner = vidioc_g_tuner, |
1434 | .vidioc_s_tuner = vidioc_s_tuner, | 1402 | .vidioc_s_tuner = vidioc_s_tuner, |
1435 | .vidioc_g_frequency = vidioc_g_frequency, | 1403 | .vidioc_g_frequency = vidioc_g_frequency, |