[PATCH v3 04/22] drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory

[Andrzej Pietrasiewicz]

Use the ddc pointer provided by the generic connector.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/rockchip/inno_hdmi.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c 
b/drivers/gpu/drm/rockchip/inno_hdmi.c
index f8ca98d294d0..d64b119c2649 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -59,7 +59,6 @@ struct inno_hdmi {
        struct drm_encoder      encoder;
 
        struct inno_hdmi_i2c *i2c;
-       struct i2c_adapter *ddc;
 
        unsigned int tmds_rate;
 
@@ -552,10 +551,10 @@ static int inno_hdmi_connector_get_modes(struct 
drm_connector *connector)
        struct edid *edid;
        int ret = 0;
 
-       if (!hdmi->ddc)
+       if (!hdmi->connector.ddc)
                return 0;
 
-       edid = drm_get_edid(connector, hdmi->ddc);
+       edid = drm_get_edid(connector, hdmi->connector.ddc);
        if (edid) {
                hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
                hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
@@ -850,10 +849,10 @@ static int inno_hdmi_bind(struct device *dev, struct 
device *master,
 
        inno_hdmi_reset(hdmi);
 
-       hdmi->ddc = inno_hdmi_i2c_adapter(hdmi);
-       if (IS_ERR(hdmi->ddc)) {
-               ret = PTR_ERR(hdmi->ddc);
-               hdmi->ddc = NULL;
+       hdmi->connector.ddc = inno_hdmi_i2c_adapter(hdmi);
+       if (IS_ERR(hdmi->connector.ddc)) {
+               ret = PTR_ERR(hdmi->connector.ddc);
+               hdmi->connector.ddc = NULL;
                goto err_disable_clk;
        }
 
@@ -886,7 +885,7 @@ static int inno_hdmi_bind(struct device *dev, struct device 
*master,
        hdmi->connector.funcs->destroy(&hdmi->connector);
        hdmi->encoder.funcs->destroy(&hdmi->encoder);
 err_put_adapter:
-       i2c_put_adapter(hdmi->ddc);
+       i2c_put_adapter(hdmi->connector.ddc);
 err_disable_clk:
        clk_disable_unprepare(hdmi->pclk);
        return ret;
@@ -900,7 +899,7 @@ static void inno_hdmi_unbind(struct device *dev, struct 
device *master,
        hdmi->connector.funcs->destroy(&hdmi->connector);
        hdmi->encoder.funcs->destroy(&hdmi->encoder);
 
-       i2c_put_adapter(hdmi->ddc);
+       i2c_put_adapter(hdmi->connector.ddc);
        clk_disable_unprepare(hdmi->pclk);
 }
 
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel