Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/video/cx18/cx18-av-core.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/video/cx25840/cx25840-core.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/video/saa7115.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/tvp5150.c

+0 −3
Original line number Diff line number Diff line
@@ -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);