V4L/DVB (9160): v4l: remove vidioc_enum_fmt_vbi_cap

Remove the vidioc_enum_fmt_vbi_cap ops: it was scheduled for removal in
2.6.28 since the v4l2 specification says that V4L2_BUF_TYPE_VBI_CAPTURE should
not support VIDIOC_ENUM_FMT. It's also pretty pointless.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 0 insertions, 12 deletions

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 140ef92c19c..155c9d77a46 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -746,18 +746,6 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                                 ret = ops->vidioc_enum_fmt_vid_overlay(file,
                                         fh, f);
                         break;
-#if 1
-                /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT
-                 * according to the spec. The bttv and saa7134 drivers support
-                 * it though, so just warn that this is deprecated and will be
-                 * removed in the near future. */
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (ops->vidioc_enum_fmt_vbi_cap) {
-                                printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");
-                                ret = ops->vidioc_enum_fmt_vbi_cap(file, fh, f);
-                        }
-                        break;
-#endif
                 case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                         if (ops->vidioc_enum_fmt_vid_out)
                                 ret = ops->vidioc_enum_fmt_vid_out(file, fh, f);