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

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

V4L/DVB: saa7115: remove obsolete g/s_fmt ops 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c1658caf

drivers/media/video/saa7115.c

+0 −17
Original line number Diff line number Diff line
@@ -1117,13 +1117,6 @@ static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f 
	return 0;

}



static int saa711x_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)

{

	if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)

		return -EINVAL;

	return saa711x_g_sliced_fmt(sd, &fmt->fmt.sliced);

}



static int saa711x_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt)

{

	saa711x_set_lcr(sd, NULL);
@@ -1145,14 +1138,6 @@ static int saa711x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt 
	return saa711x_set_size(sd, fmt->width, fmt->height);

}



static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)

{

	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	return saa711x_set_size(sd, fmt->fmt.pix.width, fmt->fmt.pix.height);

}



/* Decode the sliced VBI data stream as created by the saa7115.

   The format is described in the saa7115 datasheet in Tables 25 and 26

   and in Figure 33.
@@ -1565,8 +1550,6 @@ static const struct v4l2_subdev_audio_ops saa711x_audio_ops = { 
static const struct v4l2_subdev_video_ops saa711x_video_ops = {

	.s_routing = saa711x_s_routing,

	.s_crystal_freq = saa711x_s_crystal_freq,

	.g_fmt = saa711x_g_fmt,

	.s_fmt = saa711x_s_fmt,

	.s_mbus_fmt = saa711x_s_mbus_fmt,

	.s_stream = saa711x_s_stream,

	.querystd = saa711x_querystd,