The patch number 14800 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt
Now that s_fmt is no longer used for VBI format setup in subdevs, remove
the VBI support from s_fmt.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/cx18/cx18-av-core.c | 6 ------
linux/drivers/media/video/cx25840/cx25840-core.c | 6 ------
linux/drivers/media/video/saa7115.c | 4 ----
linux/drivers/media/video/tvp5150.c | 3 ---
4 files changed, 19 deletions(-)
diff -r 3b66a9e8c856 -r 208c16279c17
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Wed May 12 15:12:01
2010 -0300
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Wed May 12 15:22:59
2010 -0300
@@ -1098,12 +1098,6 @@
cx18_av_write(cx, 0x41e, 0x8 | filter);
break;
- case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
- return cx18_av_s_sliced_fmt(sd, &fmt->fmt.sliced);
-
- case V4L2_BUF_TYPE_VBI_CAPTURE:
- return cx18_av_s_raw_fmt(sd, &fmt->fmt.vbi);
-
default:
return -EINVAL;
}
diff -r 3b66a9e8c856 -r 208c16279c17
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Wed May 12 15:12:01
2010 -0300
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Wed May 12 15:22:59
2010 -0300
@@ -1111,12 +1111,6 @@
cx25840_write(client, 0x41e, 0x8 | filter);
break;
- case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
- return cx25840_s_sliced_fmt(sd, &fmt->fmt.sliced);
-
- case V4L2_BUF_TYPE_VBI_CAPTURE:
- return cx25840_s_raw_fmt(sd, &fmt->fmt.vbi);
-
default:
return -EINVAL;
}
diff -r 3b66a9e8c856 -r 208c16279c17 linux/drivers/media/video/saa7115.c
--- a/linux/drivers/media/video/saa7115.c Wed May 12 15:12:01 2010 -0300
+++ b/linux/drivers/media/video/saa7115.c Wed May 12 15:22:59 2010 -0300
@@ -1147,10 +1147,6 @@
static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
{
- if (fmt->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
- return saa711x_s_sliced_fmt(sd, &fmt->fmt.sliced);
- if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE)
- return saa711x_s_raw_fmt(sd, &fmt->fmt.vbi);
if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
diff -r 3b66a9e8c856 -r 208c16279c17 linux/drivers/media/video/tvp5150.c
--- a/linux/drivers/media/video/tvp5150.c Wed May 12 15:12:01 2010 -0300
+++ b/linux/drivers/media/video/tvp5150.c Wed May 12 15:22:59 2010 -0300
@@ -958,9 +958,6 @@
static int tvp5150_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
{
switch (fmt->type) {
- case V4L2_BUF_TYPE_VBI_CAPTURE:
- return tvp5150_s_raw_fmt(sd, &fmt->fmt.vbi);
-
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/208c16279c17e94c63e2ef8873cdc3b6f5545ab4
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
