gpu: drm: exynos_hdmi: Move DDC logic into single function

Paring DT properties and getting the I2C adapter in one function.

Change-Id: I1df1b6294f61013110bcddb223a3b35fb5c17169
Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index b2258359e7c824a7d6af5de644475ce4a81872e5..16f358aee5f5c10fc475129dea4cec486db059eb 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1868,16 +1868,34 @@ static const struct component_ops hdmi_component_ops = {
        .unbind = hdmi_unbind,
 };
 
-static struct device_node *hdmi_legacy_ddc_dt_binding(struct device *dev)
+static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)
 {
        const char *compatible_str = "samsung,exynos4210-hdmiddc";
        struct device_node *np;
+       struct i2c_adapter *adpt;
 
        np = of_find_compatible_node(NULL, NULL, compatible_str);
        if (np)
-               return of_get_next_parent(np);
+               np = of_get_next_parent(np);
+       else
+               np = of_parse_phandle(hdata->dev->of_node, "ddc", 0);
+
+       if (!np) {
+               DRM_ERROR("Failed to find ddc node in device tree\n");
+               return -ENODEV;
+       }
+
+       adpt = of_find_i2c_adapter_by_node(np);
+       of_node_put(np);
+
+       if (!adpt) {
+               DRM_INFO("Failed to get ddc i2c adapter by node\n");
+               return -EPROBE_DEFER;
+       }
 
-       return NULL;
+       hdata->ddc_adpt = adpt;
+
+       return 0;
 }
 
 static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
@@ -1889,7 +1907,7 @@ static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
 
 static int hdmi_probe(struct platform_device *pdev)
 {
-       struct device_node *ddc_node, *phy_node;
+       struct device_node *phy_node;
        const struct of_device_id *match;
        struct device *dev = &pdev->dev;
        struct hdmi_context *hdata;
@@ -1928,23 +1946,9 @@ static int hdmi_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ddc_node = hdmi_legacy_ddc_dt_binding(dev);
-       if (ddc_node)
-               goto out_get_ddc_adpt;
-
-       /* DDC i2c driver */
-       ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);
-       if (!ddc_node) {
-               DRM_ERROR("Failed to find ddc node in device tree\n");
-               return -ENODEV;
-       }
-
-out_get_ddc_adpt:
-       hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);
-       if (!hdata->ddc_adpt) {
-               DRM_ERROR("Failed to get ddc i2c adapter by node\n");
-               return -EPROBE_DEFER;
-       }
+       ret = hdmi_get_ddc_adapter(hdata);
+       if (ret)
+               return ret;
 
        phy_node = hdmi_legacy_phy_dt_binding(dev);
        if (phy_node)