This simplifies the code and gives additional information upon deferral.

Signed-off-by: Alexander Stein <alexander.st...@ew.tq-group.com>
---
 drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 26 ++++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c 
b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
index 4a886cb808ca..3a1d5795d002 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
@@ -403,20 +403,12 @@ static int imx8qxp_pxl2dpi_bridge_probe(struct 
platform_device *pdev)
                return -ENOMEM;
 
        p2d->regmap = syscon_node_to_regmap(np->parent);
-       if (IS_ERR(p2d->regmap)) {
-               ret = PTR_ERR(p2d->regmap);
-               if (ret != -EPROBE_DEFER)
-                       DRM_DEV_ERROR(dev, "failed to get regmap: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(p2d->regmap))
+               return dev_err_probe(dev, ret, "failed to get regmap\n");
 
        ret = imx_scu_get_handle(&p2d->ipc_handle);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       DRM_DEV_ERROR(dev, "failed to get SCU ipc handle: %d\n",
-                                     ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "failed to get SCU ipc 
handle\n");
 
        p2d->dev = dev;
 
@@ -427,13 +419,9 @@ static int imx8qxp_pxl2dpi_bridge_probe(struct 
platform_device *pdev)
        }
 
        p2d->next_bridge = imx8qxp_pxl2dpi_find_next_bridge(p2d);
-       if (IS_ERR(p2d->next_bridge)) {
-               ret = PTR_ERR(p2d->next_bridge);
-               if (ret != -EPROBE_DEFER)
-                       DRM_DEV_ERROR(dev, "failed to find next bridge: %d\n",
-                                     ret);
-               return ret;
-       }
+       if (IS_ERR(p2d->next_bridge))
+               return dev_err_probe(dev, PTR_ERR(p2d->next_bridge),
+                                    "failed to find next bridge\n");
 
        ret = imx8qxp_pxl2dpi_set_pixel_link_sel(p2d);
        if (ret)
-- 
2.34.1

Reply via email to