Use dev_err_probe() to make error code and deferred probe handling
simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlow...@linaro.org>
---
 drivers/gpu/drm/mediatek/mtk_hdmi.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c 
b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 4b0eb7dc25d8..22935fdc5afe 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1429,19 +1429,13 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi 
*hdmi,
        int ret;
 
        ret = mtk_hdmi_get_all_clk(hdmi, np);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get clocks: %d\n", ret);
-
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to get clocks\n");
 
        /* The CEC module handles HDMI hotplug detection */
        cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
-       if (!cec_np) {
-               dev_err(dev, "Failed to find CEC node\n");
-               return -EINVAL;
-       }
+       if (!cec_np)
+               return dev_err_probe(dev, -EINVAL, "Failed to find CEC node\n");
 
        cec_pdev = of_find_device_by_node(cec_np);
        if (!cec_pdev) {
@@ -1492,10 +1486,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
 
        i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);
        if (!i2c_np) {
-               dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n",
-                       remote);
+               ret = dev_err_probe(dev, -EINVAL, "Failed to find ddc-i2c-bus 
node in %pOF\n",
+                                   remote);
                of_node_put(remote);
-               ret = -EINVAL;
                goto put_device;
        }
        of_node_put(remote);
@@ -1503,8 +1496,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
        hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);
        of_node_put(i2c_np);
        if (!hdmi->ddc_adpt) {
-               dev_err(dev, "Failed to get ddc i2c adapter by node\n");
-               ret = -EINVAL;
+               ret = dev_err_probe(dev, -EINVAL, "Failed to get ddc i2c 
adapter by node\n");
                goto put_device;
        }
 
-- 
2.43.0

Reply via email to