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>

1 files changed, 0 insertions, 4 deletions

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;