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/bt8xx | |
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/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 54fbab95b88c..961d0805d877 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -2597,31 +2597,6 @@ static int bttv_s_fmt_vid_overlay(struct file *file, void *priv, | |||
2597 | return setup_window_lock(fh, btv, &f->fmt.win, 1); | 2597 | return setup_window_lock(fh, btv, &f->fmt.win, 1); |
2598 | } | 2598 | } |
2599 | 2599 | ||
2600 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
2601 | static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | ||
2602 | { | ||
2603 | int retval; | ||
2604 | unsigned int i; | ||
2605 | struct bttv_fh *fh = priv; | ||
2606 | |||
2607 | retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, | ||
2608 | V4L2_MEMORY_MMAP); | ||
2609 | if (retval < 0) { | ||
2610 | return retval; | ||
2611 | } | ||
2612 | |||
2613 | gbuffers = retval; | ||
2614 | memset(mbuf, 0, sizeof(*mbuf)); | ||
2615 | mbuf->frames = gbuffers; | ||
2616 | mbuf->size = gbuffers * gbufsize; | ||
2617 | |||
2618 | for (i = 0; i < gbuffers; i++) | ||
2619 | mbuf->offsets[i] = i * gbufsize; | ||
2620 | |||
2621 | return 0; | ||
2622 | } | ||
2623 | #endif | ||
2624 | |||
2625 | static int bttv_querycap(struct file *file, void *priv, | 2600 | static int bttv_querycap(struct file *file, void *priv, |
2626 | struct v4l2_capability *cap) | 2601 | struct v4l2_capability *cap) |
2627 | { | 2602 | { |
@@ -3354,9 +3329,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = { | |||
3354 | .vidioc_streamoff = bttv_streamoff, | 3329 | .vidioc_streamoff = bttv_streamoff, |
3355 | .vidioc_g_tuner = bttv_g_tuner, | 3330 | .vidioc_g_tuner = bttv_g_tuner, |
3356 | .vidioc_s_tuner = bttv_s_tuner, | 3331 | .vidioc_s_tuner = bttv_s_tuner, |
3357 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
3358 | .vidiocgmbuf = vidiocgmbuf, | ||
3359 | #endif | ||
3360 | .vidioc_g_crop = bttv_g_crop, | 3332 | .vidioc_g_crop = bttv_g_crop, |
3361 | .vidioc_s_crop = bttv_s_crop, | 3333 | .vidioc_s_crop = bttv_s_crop, |
3362 | .vidioc_g_fbuf = bttv_g_fbuf, | 3334 | .vidioc_g_fbuf = bttv_g_fbuf, |