aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/adv7604.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-04 06:05:19 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-11 09:13:15 -0400
commitb09dfac83201812bf359e32a17afc7f6763ae379 (patch)
treefe744792d7e45cb33e2349b8048c5a4d117cbb05 /drivers/media/i2c/adv7604.c
parentdd519bb34a09d86db720f8a65e7dee1a85b2e90f (diff)
[media] adv*: replace the deprecated v4l2_subdev_edid by v4l2_edid
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c/adv7604.c')
-rw-r--r--drivers/media/i2c/adv7604.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 71c8570bd9ea..98cc5407f1b1 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -1658,7 +1658,7 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
1658 return 0; 1658 return 0;
1659} 1659}
1660 1660
1661static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid) 1661static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
1662{ 1662{
1663 struct adv7604_state *state = to_state(sd); 1663 struct adv7604_state *state = to_state(sd);
1664 u8 *data = NULL; 1664 u8 *data = NULL;
@@ -1728,7 +1728,7 @@ static int get_edid_spa_location(const u8 *edid)
1728 return -1; 1728 return -1;
1729} 1729}
1730 1730
1731static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid) 1731static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
1732{ 1732{
1733 struct adv7604_state *state = to_state(sd); 1733 struct adv7604_state *state = to_state(sd);
1734 int spa_loc; 1734 int spa_loc;