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

Commit 78dc47bb authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: mixer: Switch to pad-level DV operations 



The video-level enum_dv_timings and dv_timings_cap operations are
deprecated in favor of the pad-level versions. All subdev drivers
implement the pad-level versions, switch to them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 0eda185c

drivers/media/platform/s5p-tv/mixer_video.c

+6 −2
Original line number Diff line number Diff line
@@ -509,9 +509,11 @@ static int mxr_enum_dv_timings(struct file *file, void *fh, 
	struct mxr_device *mdev = layer->mdev;

	int ret;



	timings->pad = 0;



	/* lock protects from changing sd_out */

	mutex_lock(&mdev->mutex);

	ret = v4l2_subdev_call(to_outsd(mdev), video, enum_dv_timings, timings);

	ret = v4l2_subdev_call(to_outsd(mdev), pad, enum_dv_timings, timings);

	mutex_unlock(&mdev->mutex);



	return ret ? -EINVAL : 0;
@@ -567,9 +569,11 @@ static int mxr_dv_timings_cap(struct file *file, void *fh, 
	struct mxr_device *mdev = layer->mdev;

	int ret;



	cap->pad = 0;



	/* lock protects from changing sd_out */

	mutex_lock(&mdev->mutex);

	ret = v4l2_subdev_call(to_outsd(mdev), video, dv_timings_cap, cap);

	ret = v4l2_subdev_call(to_outsd(mdev), pad, dv_timings_cap, cap);

	mutex_unlock(&mdev->mutex);



	return ret ? -EINVAL : 0;