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>
This commit is contained in:
parent
4a61ecbd34
commit
aae6e33f8d
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user