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

Commit 7515e096 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] adv7604: Remove deprecated video-level DV timings operations 



The video enum_dv_timings and dv_timings_cap operations are deprecated
and unused. Remove 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 afec5599

drivers/media/i2c/adv7604.c

+9 −26
Original line number Diff line number Diff line
@@ -1527,16 +1527,20 @@ static int adv7604_enum_dv_timings(struct v4l2_subdev *sd, 
	return 0;

}



static int __adv7604_dv_timings_cap(struct v4l2_subdev *sd,

			struct v4l2_dv_timings_cap *cap,

			unsigned int pad)

static int adv7604_dv_timings_cap(struct v4l2_subdev *sd,

			struct v4l2_dv_timings_cap *cap)

{

	struct adv7604_state *state = to_state(sd);



	if (cap->pad >= state->source_pad)

		return -EINVAL;



	cap->type = V4L2_DV_BT_656_1120;

	cap->bt.max_width = 1920;

	cap->bt.max_height = 1200;

	cap->bt.min_pixelclock = 25000000;



	switch (pad) {

	switch (cap->pad) {

	case ADV7604_PAD_HDMI_PORT_A:

	case ADV7604_PAD_HDMI_PORT_B:

	case ADV7604_PAD_HDMI_PORT_C:
@@ -1557,25 +1561,6 @@ static int __adv7604_dv_timings_cap(struct v4l2_subdev *sd, 
	return 0;

}



static int adv7604_dv_timings_cap(struct v4l2_subdev *sd,

			struct v4l2_dv_timings_cap *cap)

{

	struct adv7604_state *state = to_state(sd);



	return __adv7604_dv_timings_cap(sd, cap, state->selected_input);

}



static int adv7604_pad_dv_timings_cap(struct v4l2_subdev *sd,

			struct v4l2_dv_timings_cap *cap)

{

	struct adv7604_state *state = to_state(sd);



	if (cap->pad >= state->source_pad)

		return -EINVAL;



	return __adv7604_dv_timings_cap(sd, cap, cap->pad);

}



/* Fill the optional fields .standards and .flags in struct v4l2_dv_timings

   if the format is listed in adv7604_timings[] */

static void adv7604_fill_optional_dv_timings_fields(struct v4l2_subdev *sd,
@@ -2453,8 +2438,6 @@ static const struct v4l2_subdev_video_ops adv7604_video_ops = { 
	.s_dv_timings = adv7604_s_dv_timings,

	.g_dv_timings = adv7604_g_dv_timings,

	.query_dv_timings = adv7604_query_dv_timings,

	.enum_dv_timings = adv7604_enum_dv_timings,

	.dv_timings_cap = adv7604_dv_timings_cap,

};



static const struct v4l2_subdev_pad_ops adv7604_pad_ops = {
@@ -2463,7 +2446,7 @@ static const struct v4l2_subdev_pad_ops adv7604_pad_ops = { 
	.set_fmt = adv7604_set_format,

	.get_edid = adv7604_get_edid,

	.set_edid = adv7604_set_edid,

	.dv_timings_cap = adv7604_pad_dv_timings_cap,

	.dv_timings_cap = adv7604_dv_timings_cap,

	.enum_dv_timings = adv7604_enum_dv_timings,

};