Skip to content

Commit 31b4403

Browse files
Andy Yanmmind
authored andcommitted
drm/rockchip: inno-hdmi: Simplify error handler with dev_err_probe
Use dev_err_probe simplify the error handle. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Tested-by: Heiko Stuebner <heiko@sntech.de> #rk3036-kylin Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://lore.kernel.org/r/20250422070455.432666-4-andyshrk@163.com
1 parent e0c9398 commit 31b4403

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

drivers/gpu/drm/rockchip/inno_hdmi.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -885,29 +885,22 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
885885
return PTR_ERR(hdmi->regs);
886886

887887
hdmi->pclk = devm_clk_get(hdmi->dev, "pclk");
888-
if (IS_ERR(hdmi->pclk)) {
889-
DRM_DEV_ERROR(hdmi->dev, "Unable to get HDMI pclk clk\n");
890-
return PTR_ERR(hdmi->pclk);
891-
}
888+
if (IS_ERR(hdmi->pclk))
889+
return dev_err_probe(dev, PTR_ERR(hdmi->pclk), "Unable to get HDMI pclk\n");
892890

893891
ret = clk_prepare_enable(hdmi->pclk);
894-
if (ret) {
895-
DRM_DEV_ERROR(hdmi->dev,
896-
"Cannot enable HDMI pclk clock: %d\n", ret);
897-
return ret;
898-
}
892+
if (ret)
893+
return dev_err_probe(dev, ret, "Cannot enable HDMI pclk: %d\n", ret);
899894

900895
hdmi->refclk = devm_clk_get_optional(hdmi->dev, "ref");
901896
if (IS_ERR(hdmi->refclk)) {
902-
DRM_DEV_ERROR(hdmi->dev, "Unable to get HDMI reference clock\n");
903-
ret = PTR_ERR(hdmi->refclk);
897+
ret = dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI refclk\n");
904898
goto err_disable_pclk;
905899
}
906900

907901
ret = clk_prepare_enable(hdmi->refclk);
908902
if (ret) {
909-
DRM_DEV_ERROR(hdmi->dev,
910-
"Cannot enable HDMI reference clock: %d\n", ret);
903+
ret = dev_err_probe(dev, ret, "Cannot enable HDMI refclk: %d\n", ret);
911904
goto err_disable_pclk;
912905
}
913906

0 commit comments

Comments
 (0)