[PATCH v3 18/22] drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory

[Andrzej Pietrasiewicz]

Use the ddc pointer provided by the generic connector.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/bridge/dumb-vga-dac.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c 
b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index d32885b906ae..b4cc3238400a 100644
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -20,7 +20,6 @@ struct dumb_vga {
        struct drm_bridge       bridge;
        struct drm_connector    connector;
 
-       struct i2c_adapter      *ddc;
        struct regulator        *vdd;
 };
 
@@ -42,10 +41,10 @@ static int dumb_vga_get_modes(struct drm_connector 
*connector)
        struct edid *edid;
        int ret;
 
-       if (IS_ERR(vga->ddc))
+       if (IS_ERR(vga->connector.ddc))
                goto fallback;
 
-       edid = drm_get_edid(connector, vga->ddc);
+       edid = drm_get_edid(connector, vga->connector.ddc);
        if (!edid) {
                DRM_INFO("EDID readout failed, falling back to standard 
modes\n");
                goto fallback;
@@ -84,7 +83,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, 
bool force)
         * wire the DDC pins, or the I2C bus might not be working at
         * all.
         */
-       if (!IS_ERR(vga->ddc) && drm_probe_ddc(vga->ddc))
+       if (!IS_ERR(vga->connector.ddc) && drm_probe_ddc(vga->connector.ddc))
                return connector_status_connected;
 
        return connector_status_unknown;
@@ -190,14 +189,14 @@ static int dumb_vga_probe(struct platform_device *pdev)
                dev_dbg(&pdev->dev, "No vdd regulator found: %d\n", ret);
        }
 
-       vga->ddc = dumb_vga_retrieve_ddc(&pdev->dev);
-       if (IS_ERR(vga->ddc)) {
-               if (PTR_ERR(vga->ddc) == -ENODEV) {
+       vga->connector.ddc = dumb_vga_retrieve_ddc(&pdev->dev);
+       if (IS_ERR(vga->connector.ddc)) {
+               if (PTR_ERR(vga->connector.ddc) == -ENODEV) {
                        dev_dbg(&pdev->dev,
                                "No i2c bus specified. Disabling EDID 
readout\n");
                } else {
                        dev_err(&pdev->dev, "Couldn't retrieve i2c bus\n");
-                       return PTR_ERR(vga->ddc);
+                       return PTR_ERR(vga->connector.ddc);
                }
        }
 
@@ -216,8 +215,8 @@ static int dumb_vga_remove(struct platform_device *pdev)
 
        drm_bridge_remove(&vga->bridge);
 
-       if (!IS_ERR(vga->ddc))
-               i2c_put_adapter(vga->ddc);
+       if (!IS_ERR(vga->connector.ddc))
+               i2c_put_adapter(vga->connector.ddc);
 
        return 0;
 }
-- 
2.17.1

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