Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c7b933b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d4f59de4

drivers/media/video/bt8xx/bttv-driver.c

+0 −13
Original line number Diff line number Diff line
@@ -2664,18 +2664,6 @@ static int bttv_querycap(struct file *file, void *priv, 
	return 0;

}



static int bttv_enum_fmt_vbi_cap(struct file *file, void  *priv,

				struct v4l2_fmtdesc *f)

{

	if (0 != f->index)

		return -EINVAL;



	f->pixelformat = V4L2_PIX_FMT_GREY;

	strcpy(f->description, "vbi data");



	return 0;

}



static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)

{

	int index = -1, i;
@@ -3381,7 +3369,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = { 
	.vidioc_g_fmt_vid_overlay       = bttv_g_fmt_vid_overlay,

	.vidioc_try_fmt_vid_overlay     = bttv_try_fmt_vid_overlay,

	.vidioc_s_fmt_vid_overlay       = bttv_s_fmt_vid_overlay,

	.vidioc_enum_fmt_vbi_cap        = bttv_enum_fmt_vbi_cap,

	.vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,

	.vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,

	.vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,

drivers/media/video/saa7134/saa7134-video.c

+0 −13
Original line number Diff line number Diff line
@@ -2110,18 +2110,6 @@ static int saa7134_enum_fmt_vid_overlay(struct file *file, void *priv, 
	return 0;

}



static int saa7134_enum_fmt_vbi_cap(struct file *file, void  *priv,

					struct v4l2_fmtdesc *f)

{

	if (0 != f->index)

		return -EINVAL;



	f->pixelformat = V4L2_PIX_FMT_GREY;

	strcpy(f->description, "vbi data");



	return 0;

}



static int saa7134_g_fbuf(struct file *file, void *f,

				struct v4l2_framebuffer *fb)

{
@@ -2412,7 +2400,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_g_fmt_vid_overlay	= saa7134_g_fmt_vid_overlay,

	.vidioc_try_fmt_vid_overlay	= saa7134_try_fmt_vid_overlay,

	.vidioc_s_fmt_vid_overlay	= saa7134_s_fmt_vid_overlay,

	.vidioc_enum_fmt_vbi_cap	= saa7134_enum_fmt_vbi_cap,

	.vidioc_g_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,

	.vidioc_try_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,

	.vidioc_s_fmt_vbi_cap		= saa7134_try_get_set_fmt_vbi_cap,

drivers/media/video/v4l2-ioctl.c

+0 −12
Original line number Diff line number Diff line
@@ -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);

include/media/v4l2-ioctl.h

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ struct v4l2_ioctl_ops { 
					    struct v4l2_fmtdesc *f);

	int (*vidioc_enum_fmt_vid_out)     (struct file *file, void *fh,

					    struct v4l2_fmtdesc *f);

#if 1

	/* deprecated, will be removed in 2.6.28 */

	int (*vidioc_enum_fmt_vbi_cap)     (struct file *file, void *fh,

					    struct v4l2_fmtdesc *f);

#endif

	int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,

					    struct v4l2_fmtdesc *f);