imx-drm: ipu-common: Simplify the error path

Instead of jumping to goto labels, just return the error code directly.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index e35d0bf03c7b974d127f9a7b31f8a13f71ec7176..d06b0c81f3972b4da7547bcd2a84cc6efdd0bf51 100644 (file)
--- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
@@ -1075,16 +1075,14 @@ static int ipu_probe(struct platform_device *pdev)
        ipu->cpmem_base = devm_ioremap(&pdev->dev,
                        ipu_base + devtype->cpmem_ofs, PAGE_SIZE);
 
-       if (!ipu->cm_reg || !ipu->idmac_reg || !ipu->cpmem_base) {
-               ret = -ENOMEM;
-               goto failed_ioremap;
-       }
+       if (!ipu->cm_reg || !ipu->idmac_reg || !ipu->cpmem_base)
+               return -ENOMEM;
 
        ipu->clk = devm_clk_get(&pdev->dev, "bus");
        if (IS_ERR(ipu->clk)) {
                ret = PTR_ERR(ipu->clk);
                dev_err(&pdev->dev, "clk_get failed with %d", ret);
-               goto failed_clk_get;
+               return ret;
        }
 
        platform_set_drvdata(pdev, ipu);
@@ -1134,8 +1132,6 @@ out_failed_reset:
        ipu_irq_exit(ipu);
 out_failed_irq:
        clk_disable_unprepare(ipu->clk);
-failed_clk_get:
-failed_ioremap:
        return ret;
 }