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

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

V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core. 



s_std didn't belong in the tuner ops. Stricly speaking it should be part of
the video ops, but it is used by audio and tuner devices as well, so it is
more efficient to make it part of the core ops.

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

drivers/media/video/au0828/au0828-video.c

+1 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm) 
	   have to make the au0828 bridge adjust the size of its capture

	   buffer, which is currently hardcoded at 720x480 */



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_std, *norm);

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, *norm);

	return 0;

}

drivers/media/video/bt819.c

+0 −4
Original line number Diff line number Diff line
@@ -444,9 +444,6 @@ static const struct v4l2_subdev_core_ops bt819_core_ops = { 
	.g_ctrl = bt819_g_ctrl,

	.s_ctrl = bt819_s_ctrl,

	.queryctrl = bt819_queryctrl,

};



static const struct v4l2_subdev_tuner_ops bt819_tuner_ops = {

	.s_std = bt819_s_std,

};
@@ -459,7 +456,6 @@ static const struct v4l2_subdev_video_ops bt819_video_ops = { 


static const struct v4l2_subdev_ops bt819_ops = {

	.core = &bt819_core_ops,

	.tuner = &bt819_tuner_ops,

	.video = &bt819_video_ops,

};

drivers/media/video/bt8xx/bttv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm) 
		break;

	}

	id = tvnorm->v4l2_id;

	bttv_call_all(btv, tuner, s_std, id);

	bttv_call_all(btv, core, s_std, id);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ static const struct v4l2_subdev_core_ops cx18_av_general_ops = { 
	.queryctrl = cx18_av_queryctrl,

	.g_ctrl = cx18_av_g_ctrl,

	.s_ctrl = cx18_av_s_ctrl,

	.s_std = cx18_av_s_std,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register = cx18_av_g_register,

	.s_register = cx18_av_s_register,
@@ -1200,7 +1201,6 @@ static const struct v4l2_subdev_tuner_ops cx18_av_tuner_ops = { 
	.s_frequency = cx18_av_s_frequency,

	.g_tuner = cx18_av_g_tuner,

	.s_tuner = cx18_av_s_tuner,

	.s_std = cx18_av_s_std,

};



static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {

drivers/media/video/cx18/cx18-fileops.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ int cx18_v4l2_close(struct file *filp) 
		/* Mark that the radio is no longer in use */

		clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags);

		/* Switch tuner to TV */

		cx18_call_all(cx, tuner, s_std, cx->std);

		cx18_call_all(cx, core, s_std, cx->std);

		/* Select correct audio input (i.e. TV tuner or Line in) */

		cx18_audio_set_io(cx);

		if (atomic_read(&cx->ana_capturing) > 0) {