drm/bridge: lt9611: switch to ->edid_read callback

Prefer using the struct drm_edid based callback and functions.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/0c43e5cc9f0b320abd742e7efba5af7a20d8ebd9.1706038510.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index b9205d14d943356a135943ef7a329cb41df9bb21..a9c7e2b07ea10d15b06e682ac1a63c9d995e7137 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -847,13 +847,13 @@ lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
        lt9611_sleep_setup(lt9611);
 }
 
-static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,
-                                          struct drm_connector *connector)
+static const struct drm_edid *lt9611_bridge_edid_read(struct drm_bridge *bridge,
+                                                     struct drm_connector *connector)
 {
        struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
 
        lt9611_power_on(lt9611);
-       return drm_do_get_edid(connector, lt9611_get_edid_block, lt9611);
+       return drm_edid_read_custom(connector, lt9611_get_edid_block, lt9611);
 }
 
 static void lt9611_bridge_hpd_enable(struct drm_bridge *bridge)
@@ -893,7 +893,7 @@ static const struct drm_bridge_funcs lt9611_bridge_funcs = {
        .attach = lt9611_bridge_attach,
        .mode_valid = lt9611_bridge_mode_valid,
        .detect = lt9611_bridge_detect,
-       .get_edid = lt9611_bridge_get_edid,
+       .edid_read = lt9611_bridge_edid_read,
        .hpd_enable = lt9611_bridge_hpd_enable,
 
        .atomic_pre_enable = lt9611_bridge_atomic_pre_enable,