Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be798b2b authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c3836a4

drivers/staging/imx-drm/ipu-v3/ipu-common.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

}