if (IS_ERR(hdmi->ref_clk)) {
                ret = PTR_ERR(hdmi->ref_clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(hdmi->dev, "failed to get reference clock\n");
-               return ret;
+               return dev_err_probe(hdmi->dev, ret, "failed to get reference clock\n");
        }
 
        hdmi->grf_clk = devm_clk_get_optional(hdmi->dev, "grf");
        if (IS_ERR(hdmi->grf_clk)) {
                ret = PTR_ERR(hdmi->grf_clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(hdmi->dev, "failed to get grf clock\n");
-               return ret;
+               return dev_err_probe(hdmi->dev, ret, "failed to get grf clock\n");
        }
 
        ret = devm_regulator_get_enable(hdmi->dev, "avdd-0v9");
 
        ret = rockchip_hdmi_parse_dt(hdmi);
        if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(hdmi->dev, "Unable to parse OF data\n");
-               return ret;
+               return dev_err_probe(hdmi->dev, ret, "Unable to parse OF data\n");
        }
 
        hdmi->phy = devm_phy_optional_get(dev, "hdmi");
        if (IS_ERR(hdmi->phy)) {
                ret = PTR_ERR(hdmi->phy);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(hdmi->dev, "failed to get phy\n");
-               return ret;
+               return dev_err_probe(hdmi->dev, ret, "failed to get phy\n");
        }
 
        if (hdmi->phy) {