[PATCH v2 18/39] drm/bridge: it6505: 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/bridge/ite-it6505.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ite-it6505.c 
b/drivers/gpu/drm/bridge/ite-it6505.c
index 2f300f5ca051..914b58ec130d 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -458,7 +458,7 @@ struct it6505 {
        /* it6505 driver hold option */
        bool enable_drv_hold;
 
-       struct edid *cached_edid;
+       const struct drm_edid *cached_edid;
 };
 
 struct it6505_step_train_para {
@@ -2261,7 +2261,7 @@ static void it6505_plugged_status_to_codec(struct it6505 
*it6505)
 
 static void it6505_remove_edid(struct it6505 *it6505)
 {
-       kfree(it6505->cached_edid);
+       drm_edid_free(it6505->cached_edid);
        it6505->cached_edid = NULL;
 }
 
@@ -3032,15 +3032,16 @@ it6505_bridge_detect(struct drm_bridge *bridge)
        return it6505_detect(it6505);
 }
 
-static struct edid *it6505_bridge_get_edid(struct drm_bridge *bridge,
-                                          struct drm_connector *connector)
+static const struct drm_edid *it6505_bridge_edid_read(struct drm_bridge 
*bridge,
+                                                     struct drm_connector 
*connector)
 {
        struct it6505 *it6505 = bridge_to_it6505(bridge);
        struct device *dev = it6505->dev;
 
        if (!it6505->cached_edid) {
-               it6505->cached_edid = drm_do_get_edid(connector, 
it6505_get_edid_block,
-                                                     it6505);
+               it6505->cached_edid = drm_edid_read_custom(connector,
+                                                          
it6505_get_edid_block,
+                                                          it6505);
 
                if (!it6505->cached_edid) {
                        DRM_DEV_DEBUG_DRIVER(dev, "failed to get edid!");
@@ -3048,7 +3049,7 @@ static struct edid *it6505_bridge_get_edid(struct 
drm_bridge *bridge,
                }
        }
 
-       return drm_edid_duplicate(it6505->cached_edid);
+       return drm_edid_dup(it6505->cached_edid);
 }
 
 static const struct drm_bridge_funcs it6505_bridge_funcs = {
@@ -3063,7 +3064,7 @@ static const struct drm_bridge_funcs it6505_bridge_funcs 
= {
        .atomic_pre_enable = it6505_bridge_atomic_pre_enable,
        .atomic_post_disable = it6505_bridge_atomic_post_disable,
        .detect = it6505_bridge_detect,
-       .get_edid = it6505_bridge_get_edid,
+       .edid_read = it6505_bridge_edid_read,
 };
 
 static __maybe_unused int it6505_bridge_resume(struct device *dev)
-- 
2.39.2