]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/rockchip: inno-hdmi: Simplify error handler with dev_err_probe
authorAndy Yan <andy.yan@rock-chips.com>
Tue, 22 Apr 2025 07:04:42 +0000 (15:04 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Sun, 4 May 2025 10:40:52 +0000 (12:40 +0200)
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
drivers/gpu/drm/rockchip/inno_hdmi.c

index 483ecfeaebb08f89b55ae39375531a5fe716ef22..e891d42dd08a4d1d06f0efef690752f53e5b9c79 100644 (file)
@@ -885,29 +885,22 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
                return PTR_ERR(hdmi->regs);
 
        hdmi->pclk = devm_clk_get(hdmi->dev, "pclk");
-       if (IS_ERR(hdmi->pclk)) {
-               DRM_DEV_ERROR(hdmi->dev, "Unable to get HDMI pclk clk\n");
-               return PTR_ERR(hdmi->pclk);
-       }
+       if (IS_ERR(hdmi->pclk))
+               return dev_err_probe(dev, PTR_ERR(hdmi->pclk), "Unable to get HDMI pclk\n");
 
        ret = clk_prepare_enable(hdmi->pclk);
-       if (ret) {
-               DRM_DEV_ERROR(hdmi->dev,
-                             "Cannot enable HDMI pclk clock: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Cannot enable HDMI pclk: %d\n", ret);
 
        hdmi->refclk = devm_clk_get_optional(hdmi->dev, "ref");
        if (IS_ERR(hdmi->refclk)) {
-               DRM_DEV_ERROR(hdmi->dev, "Unable to get HDMI reference clock\n");
-               ret = PTR_ERR(hdmi->refclk);
+               ret = dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI refclk\n");
                goto err_disable_pclk;
        }
 
        ret = clk_prepare_enable(hdmi->refclk);
        if (ret) {
-               DRM_DEV_ERROR(hdmi->dev,
-                             "Cannot enable HDMI reference clock: %d\n", ret);
+               ret = dev_err_probe(dev, ret, "Cannot enable HDMI refclk: %d\n", ret);
                goto err_disable_pclk;
        }