Commit aae6e33f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4a61ecbd
...@@ -1098,12 +1098,6 @@ static int cx18_av_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) ...@@ -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); cx18_av_write(cx, 0x41e, 0x8 | filter);
break; 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: default:
return -EINVAL; return -EINVAL;
} }
......
...@@ -1079,12 +1079,6 @@ static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) ...@@ -1079,12 +1079,6 @@ static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
cx25840_write(client, 0x41e, 0x8 | filter); cx25840_write(client, 0x41e, 0x8 | filter);
break; 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: default:
return -EINVAL; return -EINVAL;
} }
......
...@@ -1138,10 +1138,6 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f ...@@ -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) 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) if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
......
...@@ -937,9 +937,6 @@ static int tvp5150_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f ...@@ -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) static int tvp5150_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
{ {
switch (fmt->type) { 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: case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced); return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment