]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/rockchip: dw_hdmi: Use dev_err_probe() to simplify code
authorYumeng Fang <fang.yumeng@zte.com.cn>
Thu, 15 May 2025 12:35:54 +0000 (20:35 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Tue, 8 Jul 2025 15:35:49 +0000 (17:35 +0200)
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.

Signed-off-by: Yumeng Fang <fang.yumeng@zte.com.cn>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250515203554564-j1jBXUXR6bdiN6zARicC@zte.com.cn
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

index f737e7d46e667f2411a77aa8d1004637c50fbc5c..acb59b25d928946a604fb35706a523a76067163b 100644 (file)
@@ -213,17 +213,13 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
 
        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");
@@ -573,17 +569,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 
        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) {