From aae6e33f8df8845603880468624ca29edf4bac64 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 1 May 2010 16:07:04 -0300 Subject: 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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/saa7115.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/media/video/saa7115.c') diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index cf77318..53b6fcd 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; -- cgit v1.1