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

Commit 10d2146d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpif: 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>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent f1f8e434

drivers/media/platform/davinci/vpif_capture.c

+3 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,9 @@ vpif_enum_dv_timings(struct file *file, void *priv, 
	if (input.capabilities != V4L2_IN_CAP_DV_TIMINGS)

		return -ENODATA;



	ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);

	timings->pad = 0;



	ret = v4l2_subdev_call(ch->sd, pad, enum_dv_timings, timings);

	if (ret == -ENOIOCTLCMD || ret == -ENODEV)

		return -EINVAL;

drivers/media/platform/davinci/vpif_display.c

+3 −1
Original line number Diff line number Diff line
@@ -897,7 +897,9 @@ vpif_enum_dv_timings(struct file *file, void *priv, 
	if (output.capabilities != V4L2_OUT_CAP_DV_TIMINGS)

		return -ENODATA;



	ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);

	timings->pad = 0;



	ret = v4l2_subdev_call(ch->sd, pad, enum_dv_timings, timings);

	if (ret == -ENOIOCTLCMD || ret == -ENODEV)

		return -EINVAL;

	return ret;