Commit be471406 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Chun-Kuang Hu
Browse files

drm/mediatek: mtk_dpi: Simplify with dev_err_probe() 



Use dev_err_probe() across the entire probe function of this driver
to shrink the size.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarFei Shao <fshao@chromium.org>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20230726082245.550929-3-angelogioacchino.delregno@collabora.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 47d4bb6b

drivers/gpu/drm/mediatek/mtk_dpi.c

+14 −30
Original line number Diff line number Diff line
@@ -1040,38 +1040,24 @@ static int mtk_dpi_probe(struct platform_device *pdev) 
	}

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dpi->regs = devm_ioremap_resource(dev, mem);

	if (IS_ERR(dpi->regs)) {

		ret = PTR_ERR(dpi->regs);

		dev_err(dev, "Failed to ioremap mem resource: %d\n", ret);

		return ret;

	}

	if (IS_ERR(dpi->regs))

		return dev_err_probe(dev, PTR_ERR(dpi->regs),

				     "Failed to ioremap mem resource\n");



	dpi->engine_clk = devm_clk_get(dev, "engine");

	if (IS_ERR(dpi->engine_clk)) {

		ret = PTR_ERR(dpi->engine_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get engine clock: %d\n", ret);



		return ret;

	}

	if (IS_ERR(dpi->engine_clk))

		return dev_err_probe(dev, PTR_ERR(dpi->engine_clk),

				     "Failed to get engine clock\n");



	dpi->pixel_clk = devm_clk_get(dev, "pixel");

	if (IS_ERR(dpi->pixel_clk)) {

		ret = PTR_ERR(dpi->pixel_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get pixel clock: %d\n", ret);



		return ret;

	}

	if (IS_ERR(dpi->pixel_clk))

		return dev_err_probe(dev, PTR_ERR(dpi->pixel_clk),

				     "Failed to get pixel clock\n");



	dpi->tvd_clk = devm_clk_get(dev, "pll");

	if (IS_ERR(dpi->tvd_clk)) {

		ret = PTR_ERR(dpi->tvd_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);



		return ret;

	}

	if (IS_ERR(dpi->tvd_clk))

		return dev_err_probe(dev, PTR_ERR(dpi->tvd_clk),

				     "Failed to get tvdpll clock\n");



	dpi->irq = platform_get_irq(pdev, 0);

	if (dpi->irq <= 0)
@@ -1095,10 +1081,8 @@ static int mtk_dpi_probe(struct platform_device *pdev) 
		return ret;



	ret = component_add(dev, &mtk_dpi_component_ops);

	if (ret) {

		dev_err(dev, "Failed to add component: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add component.\n");



	return 0;

}