Commit 45b70f71 authored by Nícolas F. R. A. Prado's avatar Nícolas F. R. A. Prado Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Log errors in probe with dev_err_probe() 



Use dev_err_probe() to log errors in the probe function of all drm
mediatek drivers. This avoids -EPROBE_DEFER return values from being
logged as errors, like the following:

  mediatek-disp-rdma 1c002000.rdma: Failed to add component: -517

As a side benefit it also standardizes the format of the error in the
log messages.

Signed-off-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240606-mtk-disp-rdma-dev-err-probe-v2-1-3898621767b8@collabora.com/


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

drivers/gpu/drm/mediatek/mtk_cec.c

+10 −18
Original line number Diff line number Diff line
@@ -195,18 +195,14 @@ static int mtk_cec_probe(struct platform_device *pdev) 
	spin_lock_init(&cec->lock);



	cec->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(cec->regs)) {

		ret = PTR_ERR(cec->regs);

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

		return ret;

	}

	if (IS_ERR(cec->regs))

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

				     "Failed to ioremap cec\n");



	cec->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(cec->clk)) {

		ret = PTR_ERR(cec->clk);

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

		return ret;

	}

	if (IS_ERR(cec->clk))

		return dev_err_probe(dev, PTR_ERR(cec->clk),

				     "Failed to get cec clock\n");



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

	if (cec->irq < 0)
@@ -216,16 +212,12 @@ static int mtk_cec_probe(struct platform_device *pdev) 
					mtk_cec_htplg_isr_thread,

					IRQF_SHARED | IRQF_TRIGGER_LOW |

					IRQF_ONESHOT, "hdmi hpd", dev);

	if (ret) {

		dev_err(dev, "Failed to register cec irq: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to register cec irq\n");



	ret = clk_prepare_enable(cec->clk);

	if (ret) {

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

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to enable cec clock\n");



	mtk_cec_htplg_irq_init(cec);

	mtk_cec_htplg_irq_enable(cec);

drivers/gpu/drm/mediatek/mtk_disp_aal.c

+8 −10
Original line number Diff line number Diff line
@@ -175,16 +175,14 @@ static int mtk_disp_aal_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(dev, "failed to get aal clk\n");

		return PTR_ERR(priv->clk);

	}

	if (IS_ERR(priv->clk))

		return dev_err_probe(dev, PTR_ERR(priv->clk),

				     "failed to get aal clk\n");



	priv->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->regs)) {

		dev_err(dev, "failed to ioremap aal\n");

		return PTR_ERR(priv->regs);

	}

	if (IS_ERR(priv->regs))

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

				     "failed to ioremap aal\n");



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0);
@@ -197,9 +195,9 @@ static int mtk_disp_aal_probe(struct platform_device *pdev) 


	ret = component_add(dev, &mtk_disp_aal_component_ops);

	if (ret)

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

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



	return ret;

	return 0;

}



static void mtk_disp_aal_remove(struct platform_device *pdev)

drivers/gpu/drm/mediatek/mtk_disp_ccorr.c

+8 −10
Original line number Diff line number Diff line
@@ -160,16 +160,14 @@ static int mtk_disp_ccorr_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(dev, "failed to get ccorr clk\n");

		return PTR_ERR(priv->clk);

	}

	if (IS_ERR(priv->clk))

		return dev_err_probe(dev, PTR_ERR(priv->clk),

				     "failed to get ccorr clk\n");



	priv->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->regs)) {

		dev_err(dev, "failed to ioremap ccorr\n");

		return PTR_ERR(priv->regs);

	}

	if (IS_ERR(priv->regs))

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

				     "failed to ioremap ccorr\n");



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0);
@@ -182,9 +180,9 @@ static int mtk_disp_ccorr_probe(struct platform_device *pdev) 


	ret = component_add(dev, &mtk_disp_ccorr_component_ops);

	if (ret)

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

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



	return ret;

	return 0;

}



static void mtk_disp_ccorr_remove(struct platform_device *pdev)

drivers/gpu/drm/mediatek/mtk_disp_color.c

+8 −10
Original line number Diff line number Diff line
@@ -104,17 +104,15 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(dev, "failed to get color clk\n");

		return PTR_ERR(priv->clk);

	}

	if (IS_ERR(priv->clk))

		return dev_err_probe(dev, PTR_ERR(priv->clk),

				     "failed to get color clk\n");



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(priv->regs)) {

		dev_err(dev, "failed to ioremap color\n");

		return PTR_ERR(priv->regs);

	}

	if (IS_ERR(priv->regs))

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

				     "failed to ioremap color\n");

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0);

	if (ret)
@@ -126,9 +124,9 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 


	ret = component_add(dev, &mtk_disp_color_component_ops);

	if (ret)

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

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



	return ret;

	return 0;

}



static void mtk_disp_color_remove(struct platform_device *pdev)

drivers/gpu/drm/mediatek/mtk_disp_gamma.c

+8 −10
Original line number Diff line number Diff line
@@ -264,17 +264,15 @@ static int mtk_disp_gamma_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(dev, "failed to get gamma clk\n");

		return PTR_ERR(priv->clk);

	}

	if (IS_ERR(priv->clk))

		return dev_err_probe(dev, PTR_ERR(priv->clk),

				     "failed to get gamma clk\n");



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(priv->regs)) {

		dev_err(dev, "failed to ioremap gamma\n");

		return PTR_ERR(priv->regs);

	}

	if (IS_ERR(priv->regs))

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

				     "failed to ioremap gamma\n");



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0);
@@ -287,9 +285,9 @@ static int mtk_disp_gamma_probe(struct platform_device *pdev) 


	ret = component_add(dev, &mtk_disp_gamma_component_ops);

	if (ret)

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

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



	return ret;

	return 0;

}



static void mtk_disp_gamma_remove(struct platform_device *pdev)