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

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

[media] adv*: replace the deprecated v4l2_subdev_edid by v4l2_edid 



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

drivers/media/i2c/ad9389b.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static const struct v4l2_subdev_core_ops ad9389b_core_ops = { 


/* ------------------------------ PAD OPS ------------------------------ */



static int ad9389b_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)

static int ad9389b_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)

{

	struct ad9389b_state *state = get_ad9389b_state(sd);

drivers/media/i2c/adv7511.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int adv7511_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 
	return 0;

}



static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)

static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)

{

	struct adv7511_state *state = get_adv7511_state(sd);

drivers/media/i2c/adv7604.c

+2 −2
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 
	return 0;

}



static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)

static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)

{

	struct adv7604_state *state = to_state(sd);

	u8 *data = NULL;
@@ -1728,7 +1728,7 @@ static int get_edid_spa_location(const u8 *edid) 
	return -1;

}



static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)

static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)

{

	struct adv7604_state *state = to_state(sd);

	int spa_loc;

drivers/media/i2c/adv7842.c

+2 −2
Original line number Diff line number Diff line
@@ -2014,7 +2014,7 @@ static int adv7842_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 
	return 0;

}



static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid)

static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)

{

	struct adv7842_state *state = to_state(sd);

	u8 *data = NULL;
@@ -2054,7 +2054,7 @@ static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edi 
	return 0;

}



static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *e)

static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *e)

{

	struct adv7842_state *state = to_state(sd);

	int err = 0;