Switch to using the ddc provided by the generic connector.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c 
b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 894a99793633..6816e37861b7 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -126,7 +126,6 @@ struct hdmi_context {
        void __iomem                    *regs;
        void __iomem                    *regs_hdmiphy;
        struct i2c_client               *hdmiphy_port;
-       struct i2c_adapter              *ddc_adpt;
        struct gpio_desc                *hpd_gpio;
        int                             irq;
        struct regmap                   *pmureg;
@@ -872,10 +871,10 @@ static int hdmi_get_modes(struct drm_connector *connector)
        struct edid *edid;
        int ret;
 
-       if (!hdata->ddc_adpt)
+       if (!connector->ddc)
                return -ENODEV;
 
-       edid = drm_get_edid(connector, hdata->ddc_adpt);
+       edid = drm_get_edid(connector, connector->ddc);
        if (!edid)
                return -ENODEV;
 
@@ -1893,7 +1892,7 @@ static int hdmi_get_ddc_adapter(struct hdmi_context 
*hdata)
                return -EPROBE_DEFER;
        }
 
-       hdata->ddc_adpt = adpt;
+       hdata->connector.ddc = adpt;
 
        return 0;
 }
@@ -2045,7 +2044,7 @@ static int hdmi_probe(struct platform_device *pdev)
        if (hdata->regs_hdmiphy)
                iounmap(hdata->regs_hdmiphy);
 err_ddc:
-       put_device(&hdata->ddc_adpt->dev);
+       put_device(&hdata->connector.ddc->dev);
 
        return ret;
 }
@@ -2072,7 +2071,7 @@ static int hdmi_remove(struct platform_device *pdev)
        if (hdata->regs_hdmiphy)
                iounmap(hdata->regs_hdmiphy);
 
-       put_device(&hdata->ddc_adpt->dev);
+       put_device(&hdata->connector.ddc->dev);
 
        mutex_destroy(&hdata->mutex);
 
-- 
2.17.1

Reply via email to