On 08/24/2016 03:07 PM, Milo Kim wrote:
> Paring DT properties and getting the I2C adapter in one function.
>
> Cc: Kukjin Kim <kg...@kernel.org>
> Cc: Krzysztof Kozlowski <k.kozlow...@samsung.com>
> Cc: David Airlie <airl...@linux.ie>
> Cc: Inki Dae <inki....@samsung.com>
> Cc: Joonyoung Shim <jy0922.s...@samsung.com>
> Cc: Seung-Woo Kim <sw0312....@samsung.com>
> Cc: Kyungmin Park <kyungmin.p...@samsung.com>
> Cc: Rob Herring <robh...@kernel.org>
> Cc: devicet...@vger.kernel.org
> Cc: linux-arm-ker...@lists.infradead.org
> Cc: linux-samsung-...@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: dri-de...@lists.freedesktop.org
> Signed-off-by: Milo Kim <woogyom....@gmail.com>
> ---
> drivers/gpu/drm/exynos/exynos_hdmi.c | 46
> ++++++++++++++++++++----------------
> 1 file changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c
> b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 2275efe..8d99b5d 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -1760,16 +1760,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;
> + }
>
> - return NULL;
> + adpt = of_find_i2c_adapter_by_node(np);
You can put of_node_put here, instead of duplicating it on both
execution paths.
> + if (!adpt) {
> + DRM_ERROR("Failed to get ddc i2c adapter by node\n");
In case of probe deferring DRM_INFO should be enough, or even DRM_DEBUG.
> + of_node_put(np);
> + return -EPROBE_DEFER;
> + }
> +
> + hdata->ddc_adpt = adpt;
> + of_node_put(np);
> +
> + return 0;
> }
>
> static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
> @@ -1781,7 +1799,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;
> struct device *dev = &pdev->dev;
> struct hdmi_context *hdata;
> struct resource *res;
> @@ -1811,23 +1829,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_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;
> - }
> - of_node_put(dev->of_node);
> -
> -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)
