From aae6e33f8df8845603880468624ca29edf4bac64 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 1 May 2010 16:07:04 -0300
Subject: [PATCH] V4L/DVB: 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.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/video/cx18/cx18-av-core.c | 6 ------
drivers/media/video/cx25840/cx25840-core.c | 6 ------
drivers/media/video/saa7115.c | 4 ----
drivers/media/video/tvp5150.c | 3 ---
4 files changed, 19 deletions(-)
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index c02892302094..0e5006b14279 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -1098,12 +1098,6 @@ static int cx18_av_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
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 --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index a20df8c184ed..8b6fb3544376 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1079,12 +1079,6 @@ static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
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 --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index cf77318ede43..53b6fcde3800 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1138,10 +1138,6 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
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 --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 853dd6f39b97..47f0582d50a5 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -937,9 +937,6 @@ static int tvp5150_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
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);
--
2.20.1