[PATCH v2 32/39] drm: xlnx: zynqmp_dpsub: switch to ->edid_read callback

[Jani Nikula]

Prefer using the struct drm_edid based callback and functions.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/xlnx/zynqmp_dp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
index a0606fab0e22..24213eaa38d0 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
@@ -1560,12 +1560,12 @@ static enum drm_connector_status 
zynqmp_dp_bridge_detect(struct drm_bridge *brid
        return connector_status_disconnected;
 }
 
-static struct edid *zynqmp_dp_bridge_get_edid(struct drm_bridge *bridge,
-                                             struct drm_connector *connector)
+static const struct drm_edid *zynqmp_dp_bridge_edid_read(struct drm_bridge 
*bridge,
+                                                        struct drm_connector 
*connector)
 {
        struct zynqmp_dp *dp = bridge_to_dp(bridge);
 
-       return drm_get_edid(connector, &dp->aux.ddc);
+       return drm_edid_read_ddc(connector, &dp->aux.ddc);
 }
 
 static const struct drm_bridge_funcs zynqmp_dp_bridge_funcs = {
@@ -1579,7 +1579,7 @@ static const struct drm_bridge_funcs 
zynqmp_dp_bridge_funcs = {
        .atomic_reset = drm_atomic_helper_bridge_reset,
        .atomic_check = zynqmp_dp_bridge_atomic_check,
        .detect = zynqmp_dp_bridge_detect,
-       .get_edid = zynqmp_dp_bridge_get_edid,
+       .edid_read = zynqmp_dp_bridge_edid_read,
 };
 
 /* 
-----------------------------------------------------------------------------
-- 
2.39.2