Skip to content

Commit 52008d6

Browse files
Yumeng Fangmmind
authored andcommitted
drm/rockchip: dw_hdmi: Use dev_err_probe() to simplify code
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
1 parent afbbca2 commit 52008d6

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,13 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
213213

214214
if (IS_ERR(hdmi->ref_clk)) {
215215
ret = PTR_ERR(hdmi->ref_clk);
216-
if (ret != -EPROBE_DEFER)
217-
dev_err(hdmi->dev, "failed to get reference clock\n");
218-
return ret;
216+
return dev_err_probe(hdmi->dev, ret, "failed to get reference clock\n");
219217
}
220218

221219
hdmi->grf_clk = devm_clk_get_optional(hdmi->dev, "grf");
222220
if (IS_ERR(hdmi->grf_clk)) {
223221
ret = PTR_ERR(hdmi->grf_clk);
224-
if (ret != -EPROBE_DEFER)
225-
dev_err(hdmi->dev, "failed to get grf clock\n");
226-
return ret;
222+
return dev_err_probe(hdmi->dev, ret, "failed to get grf clock\n");
227223
}
228224

229225
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,
573569

574570
ret = rockchip_hdmi_parse_dt(hdmi);
575571
if (ret) {
576-
if (ret != -EPROBE_DEFER)
577-
dev_err(hdmi->dev, "Unable to parse OF data\n");
578-
return ret;
572+
return dev_err_probe(hdmi->dev, ret, "Unable to parse OF data\n");
579573
}
580574

581575
hdmi->phy = devm_phy_optional_get(dev, "hdmi");
582576
if (IS_ERR(hdmi->phy)) {
583577
ret = PTR_ERR(hdmi->phy);
584-
if (ret != -EPROBE_DEFER)
585-
dev_err(hdmi->dev, "failed to get phy\n");
586-
return ret;
578+
return dev_err_probe(hdmi->dev, ret, "failed to get phy\n");
587579
}
588580

589581
if (hdmi->phy) {

0 commit comments

Comments
 (0)