| Message ID | 20240606-mtk-disp-rdma-dev-err-probe-v2-1-3898621767b8@collabora.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] drm/mediatek: Log errors in probe with dev_err_probe() | expand |
Il 07/06/24 01:52, Nícolas F. R. A. Prado ha scritto: > 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: Nícolas F. R. A. Prado <nfraprado@collabora.com> Sweet! Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cheers, Angelo
Hi, Nicolas: On Thu, 2024-06-06 at 19:52 -0400, Nícolas F. R. A. Prado wrote: > 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. Reviewed-by: CK Hu <ck.hu@mediatek.com> > > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> > --- > Changes in v2: > - Converted all dev_err() in probe functions to dev_err_probe() instead > of just the ones in the component_add() error path > - Link to v1: https://lore.kernel.org/r/20240605-mtk-disp-rdma-dev-err-probe-v1-1-91259e1d3a93@collabora.com > --- > drivers/gpu/drm/mediatek/mtk_cec.c | 28 ++++++++-------------- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_color.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_merge.c | 25 +++++++++----------- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 24 ++++++++----------- > drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 4 ++-- > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 31 +++++++++++-------------- > drivers/gpu/drm/mediatek/mtk_dp.c | 8 +++---- > drivers/gpu/drm/mediatek/mtk_ethdr.c | 19 +++++++-------- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 31 ++++++++++--------------- > drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 21 ++++++----------- > drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_padding.c | 20 +++++++--------- > 15 files changed, 125 insertions(+), 176 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c > index 8519e9bade36..2de248443147 100644 > --- a/drivers/gpu/drm/mediatek/mtk_cec.c > +++ b/drivers/gpu/drm/mediatek/mtk_cec.c > @@ -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); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > index 3ce8f32b06d5..59fb9a08d54b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > index df35e90dd25f..9b75727e0861 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c > index 7f0085be5671..2fd5e7dc9e24 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > index ca8d1f3aca03..f0b38817ba6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > index 77c057e0e671..435e5d9c8520 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > @@ -316,22 +316,19 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) > > 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 merge\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap merge\n"); > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get merge clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get merge clk\n"); > > priv->async_clk = devm_clk_get_optional(dev, "merge_async"); > - if (IS_ERR(priv->async_clk)) { > - dev_err(dev, "failed to get merge async clock\n"); > - return PTR_ERR(priv->async_clk); > - } > + if (IS_ERR(priv->async_clk)) > + return dev_err_probe(dev, PTR_ERR(priv->async_clk), > + "failed to get merge async clock\n"); > > if (priv->async_clk) { > priv->reset_ctl = devm_reset_control_get_optional_exclusive(dev, NULL); > @@ -354,9 +351,9 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) > > ret = component_add(dev, &mtk_disp_merge_component_ops); > if (ret != 0) > - 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_merge_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index b552a02d7eae..4dd8bb8e8457 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -523,17 +523,15 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return irq; > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get ovl clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get ovl 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 ovl\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap ovl\n"); > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > if (ret) > @@ -545,20 +543,18 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > > ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); > > pm_runtime_enable(dev); > > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) { > pm_runtime_disable(dev); > - 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_ovl_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > index 02dd7dcdfedb..0744da867d4e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > @@ -612,10 +612,10 @@ static int mtk_disp_ovl_adaptor_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_disp_ovl_adaptor_comp_ops); > if (ret != 0) { > pm_runtime_disable(dev); > - 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_ovl_adaptor_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 7b1a6e631200..634bbba5d43f 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -326,17 +326,15 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > return irq; > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get rdma clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get rdma 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 rdma\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap rdma\n"); > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > if (ret) > @@ -347,10 +345,9 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > ret = of_property_read_u32(dev->of_node, > "mediatek,rdma-fifo-size", > &priv->fifo_size); > - if (ret) { > - dev_err(dev, "Failed to get rdma fifo size\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to get rdma fifo size\n"); > } > > /* Disable and clear pending interrupts */ > @@ -359,10 +356,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > ret = devm_request_irq(dev, irq, mtk_disp_rdma_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); > > priv->data = of_device_get_match_data(dev); > > @@ -373,10 +368,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) { > pm_runtime_disable(dev); > - 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_rdma_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c > index 536366956447..ed335d888b2f 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dp.c > +++ b/drivers/gpu/drm/mediatek/mtk_dp.c > @@ -2655,11 +2655,9 @@ static int mtk_dp_probe(struct platform_device *pdev) > mutex_init(&mtk_dp->update_plugged_status_lock); > > ret = mtk_dp_register_audio_driver(dev); > - if (ret) { > - dev_err(dev, "Failed to register audio driver: %d\n", > - ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to register audio driver\n"); > } > > ret = mtk_dp_register_phy(mtk_dp); > diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c > index 156c6ff547e8..b367a080500c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c > +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c > @@ -325,25 +325,24 @@ static int mtk_ethdr_probe(struct platform_device *pdev) > if (priv->irq) { > ret = devm_request_irq(dev, priv->irq, mtk_ethdr_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", priv->irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, > + "Failed to request irq %d\n", > + priv->irq); > } > > priv->reset_ctl = devm_reset_control_array_get_optional_exclusive(dev); > - if (IS_ERR(priv->reset_ctl)) { > - dev_err_probe(dev, PTR_ERR(priv->reset_ctl), "cannot get ethdr reset control\n"); > - return PTR_ERR(priv->reset_ctl); > - } > + if (IS_ERR(priv->reset_ctl)) > + return dev_err_probe(dev, PTR_ERR(priv->reset_ctl), > + "cannot get ethdr reset control\n"); > > platform_set_drvdata(pdev, priv); > > ret = component_add(dev, &mtk_ethdr_component_ops); > if (ret) > - dev_notice(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_ethdr_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index 6e1cca97a654..3790d0b433cc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -1713,26 +1713,22 @@ static int mtk_hdmi_probe(struct platform_device *pdev) > return ret; > > hdmi->phy = devm_phy_get(dev, "hdmi"); > - if (IS_ERR(hdmi->phy)) { > - ret = PTR_ERR(hdmi->phy); > - dev_err(dev, "Failed to get HDMI PHY: %d\n", ret); > - return ret; > - } > + if (IS_ERR(hdmi->phy)) > + return dev_err_probe(dev, PTR_ERR(hdmi->phy), > + "Failed to get HDMI PHY\n"); > > mutex_init(&hdmi->update_plugged_status_lock); > platform_set_drvdata(pdev, hdmi); > > ret = mtk_hdmi_output_init(hdmi); > - if (ret) { > - dev_err(dev, "Failed to initialize hdmi output\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to initialize hdmi output\n"); > > ret = mtk_hdmi_register_audio_driver(dev); > - if (ret) { > - dev_err(dev, "Failed to register audio driver: %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to register audio driver\n"); > > hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs; > hdmi->bridge.of_node = pdev->dev.of_node; > @@ -1743,15 +1739,12 @@ static int mtk_hdmi_probe(struct platform_device *pdev) > > ret = mtk_hdmi_clk_enable_audio(hdmi); > if (ret) { > - dev_err(dev, "Failed to enable audio clocks: %d\n", ret); > - goto err_bridge_remove; > + drm_bridge_remove(&hdmi->bridge); > + return dev_err_probe(dev, ret, > + "Failed to enable audio clocks\n"); > } > > return 0; > - > -err_bridge_remove: > - drm_bridge_remove(&hdmi->bridge); > - return ret; > } > > static void mtk_hdmi_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > index 52d55861f954..8e60631d4cd2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > @@ -279,20 +279,17 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > return -ENOMEM; > > ddc->clk = devm_clk_get(dev, "ddc-i2c"); > - if (IS_ERR(ddc->clk)) { > - dev_err(dev, "get ddc_clk failed: %p ,\n", ddc->clk); > - return PTR_ERR(ddc->clk); > - } > + if (IS_ERR(ddc->clk)) > + return dev_err_probe(dev, PTR_ERR(ddc->clk), > + "get ddc_clk failed\n"); > > ddc->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); > if (IS_ERR(ddc->regs)) > return PTR_ERR(ddc->regs); > > ret = clk_prepare_enable(ddc->clk); > - if (ret) { > - dev_err(dev, "enable ddc clk failed!\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "enable ddc clk failed!\n"); > > strscpy(ddc->adap.name, "mediatek-hdmi-ddc", sizeof(ddc->adap.name)); > ddc->adap.owner = THIS_MODULE; > @@ -304,8 +301,8 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > > ret = i2c_add_adapter(&ddc->adap); > if (ret < 0) { > - dev_err(dev, "failed to add bus to i2c core\n"); > - goto err_clk_disable; > + clk_disable_unprepare(ddc->clk); > + return dev_err_probe(dev, ret, "failed to add bus to i2c core\n"); > } > > platform_set_drvdata(pdev, ddc); > @@ -316,10 +313,6 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > &mem->end); > > return 0; > - > -err_clk_disable: > - clk_disable_unprepare(ddc->clk); > - return ret; > } > > static void mtk_hdmi_ddc_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > index 925cbb7471ec..7c1a8c796833 100644 > --- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > @@ -301,16 +301,14 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) > > 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 rdma\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap rdma\n"); > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get rdma clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get rdma clk\n"); > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > @@ -324,9 +322,9 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_mdp_rdma_component_ops); > if (ret != 0) { > pm_runtime_disable(dev); > - 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_mdp_rdma_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_padding.c b/drivers/gpu/drm/mediatek/mtk_padding.c > index 85bc6768b6bc..bbda590ca76e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_padding.c > +++ b/drivers/gpu/drm/mediatek/mtk_padding.c > @@ -103,23 +103,19 @@ static int mtk_padding_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 clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get clk\n"); > > priv->reg = devm_platform_get_and_ioremap_resource(pdev, 0, &res); > - if (IS_ERR(priv->reg)) { > - dev_err(dev, "failed to do ioremap\n"); > - return PTR_ERR(priv->reg); > - } > + if (IS_ERR(priv->reg)) > + return dev_err_probe(dev, PTR_ERR(priv->reg), > + "failed to do ioremap\n"); > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > - if (ret) { > - dev_err(dev, "failed to get gce client reg\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to get gce client reg\n"); > #endif > > platform_set_drvdata(pdev, priv); > > --- > base-commit: ee78a17615ad0cfdbbc27182b1047cd36c9d4d5f > change-id: 20240605-mtk-disp-rdma-dev-err-probe-ef9c10a1a91e > > Best regards,
Hi, Nicolas: Nícolas F. R. A. Prado <nfraprado@collabora.com> 於 2024年6月7日 週五 上午7:52寫道： > > 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. Applied to mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next > > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> > --- > Changes in v2: > - Converted all dev_err() in probe functions to dev_err_probe() instead > of just the ones in the component_add() error path > - Link to v1: https://lore.kernel.org/r/20240605-mtk-disp-rdma-dev-err-probe-v1-1-91259e1d3a93@collabora.com > --- > drivers/gpu/drm/mediatek/mtk_cec.c | 28 ++++++++-------------- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_color.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_disp_merge.c | 25 +++++++++----------- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 24 ++++++++----------- > drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 4 ++-- > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 31 +++++++++++-------------- > drivers/gpu/drm/mediatek/mtk_dp.c | 8 +++---- > drivers/gpu/drm/mediatek/mtk_ethdr.c | 19 +++++++-------- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 31 ++++++++++--------------- > drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 21 ++++++----------- > drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 18 +++++++------- > drivers/gpu/drm/mediatek/mtk_padding.c | 20 +++++++--------- > 15 files changed, 125 insertions(+), 176 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c > index 8519e9bade36..2de248443147 100644 > --- a/drivers/gpu/drm/mediatek/mtk_cec.c > +++ b/drivers/gpu/drm/mediatek/mtk_cec.c > @@ -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); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > index 3ce8f32b06d5..59fb9a08d54b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > index df35e90dd25f..9b75727e0861 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c > index 7f0085be5671..2fd5e7dc9e24 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > index ca8d1f3aca03..f0b38817ba6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -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) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > index 77c057e0e671..435e5d9c8520 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > @@ -316,22 +316,19 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) > > 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 merge\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap merge\n"); > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get merge clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get merge clk\n"); > > priv->async_clk = devm_clk_get_optional(dev, "merge_async"); > - if (IS_ERR(priv->async_clk)) { > - dev_err(dev, "failed to get merge async clock\n"); > - return PTR_ERR(priv->async_clk); > - } > + if (IS_ERR(priv->async_clk)) > + return dev_err_probe(dev, PTR_ERR(priv->async_clk), > + "failed to get merge async clock\n"); > > if (priv->async_clk) { > priv->reset_ctl = devm_reset_control_get_optional_exclusive(dev, NULL); > @@ -354,9 +351,9 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) > > ret = component_add(dev, &mtk_disp_merge_component_ops); > if (ret != 0) > - 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_merge_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index b552a02d7eae..4dd8bb8e8457 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -523,17 +523,15 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return irq; > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get ovl clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get ovl 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 ovl\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap ovl\n"); > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > if (ret) > @@ -545,20 +543,18 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > > ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); > > pm_runtime_enable(dev); > > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) { > pm_runtime_disable(dev); > - 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_ovl_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > index 02dd7dcdfedb..0744da867d4e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > @@ -612,10 +612,10 @@ static int mtk_disp_ovl_adaptor_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_disp_ovl_adaptor_comp_ops); > if (ret != 0) { > pm_runtime_disable(dev); > - 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_ovl_adaptor_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 7b1a6e631200..634bbba5d43f 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -326,17 +326,15 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > return irq; > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get rdma clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get rdma 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 rdma\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap rdma\n"); > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > if (ret) > @@ -347,10 +345,9 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > ret = of_property_read_u32(dev->of_node, > "mediatek,rdma-fifo-size", > &priv->fifo_size); > - if (ret) { > - dev_err(dev, "Failed to get rdma fifo size\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to get rdma fifo size\n"); > } > > /* Disable and clear pending interrupts */ > @@ -359,10 +356,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > ret = devm_request_irq(dev, irq, mtk_disp_rdma_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); > > priv->data = of_device_get_match_data(dev); > > @@ -373,10 +368,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) { > pm_runtime_disable(dev); > - 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_rdma_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c > index 536366956447..ed335d888b2f 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dp.c > +++ b/drivers/gpu/drm/mediatek/mtk_dp.c > @@ -2655,11 +2655,9 @@ static int mtk_dp_probe(struct platform_device *pdev) > mutex_init(&mtk_dp->update_plugged_status_lock); > > ret = mtk_dp_register_audio_driver(dev); > - if (ret) { > - dev_err(dev, "Failed to register audio driver: %d\n", > - ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to register audio driver\n"); > } > > ret = mtk_dp_register_phy(mtk_dp); > diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c > index 156c6ff547e8..b367a080500c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c > +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c > @@ -325,25 +325,24 @@ static int mtk_ethdr_probe(struct platform_device *pdev) > if (priv->irq) { > ret = devm_request_irq(dev, priv->irq, mtk_ethdr_irq_handler, > IRQF_TRIGGER_NONE, dev_name(dev), priv); > - if (ret < 0) { > - dev_err(dev, "Failed to request irq %d: %d\n", priv->irq, ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, > + "Failed to request irq %d\n", > + priv->irq); > } > > priv->reset_ctl = devm_reset_control_array_get_optional_exclusive(dev); > - if (IS_ERR(priv->reset_ctl)) { > - dev_err_probe(dev, PTR_ERR(priv->reset_ctl), "cannot get ethdr reset control\n"); > - return PTR_ERR(priv->reset_ctl); > - } > + if (IS_ERR(priv->reset_ctl)) > + return dev_err_probe(dev, PTR_ERR(priv->reset_ctl), > + "cannot get ethdr reset control\n"); > > platform_set_drvdata(pdev, priv); > > ret = component_add(dev, &mtk_ethdr_component_ops); > if (ret) > - dev_notice(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_ethdr_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index 6e1cca97a654..3790d0b433cc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -1713,26 +1713,22 @@ static int mtk_hdmi_probe(struct platform_device *pdev) > return ret; > > hdmi->phy = devm_phy_get(dev, "hdmi"); > - if (IS_ERR(hdmi->phy)) { > - ret = PTR_ERR(hdmi->phy); > - dev_err(dev, "Failed to get HDMI PHY: %d\n", ret); > - return ret; > - } > + if (IS_ERR(hdmi->phy)) > + return dev_err_probe(dev, PTR_ERR(hdmi->phy), > + "Failed to get HDMI PHY\n"); > > mutex_init(&hdmi->update_plugged_status_lock); > platform_set_drvdata(pdev, hdmi); > > ret = mtk_hdmi_output_init(hdmi); > - if (ret) { > - dev_err(dev, "Failed to initialize hdmi output\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to initialize hdmi output\n"); > > ret = mtk_hdmi_register_audio_driver(dev); > - if (ret) { > - dev_err(dev, "Failed to register audio driver: %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to register audio driver\n"); > > hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs; > hdmi->bridge.of_node = pdev->dev.of_node; > @@ -1743,15 +1739,12 @@ static int mtk_hdmi_probe(struct platform_device *pdev) > > ret = mtk_hdmi_clk_enable_audio(hdmi); > if (ret) { > - dev_err(dev, "Failed to enable audio clocks: %d\n", ret); > - goto err_bridge_remove; > + drm_bridge_remove(&hdmi->bridge); > + return dev_err_probe(dev, ret, > + "Failed to enable audio clocks\n"); > } > > return 0; > - > -err_bridge_remove: > - drm_bridge_remove(&hdmi->bridge); > - return ret; > } > > static void mtk_hdmi_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > index 52d55861f954..8e60631d4cd2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > @@ -279,20 +279,17 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > return -ENOMEM; > > ddc->clk = devm_clk_get(dev, "ddc-i2c"); > - if (IS_ERR(ddc->clk)) { > - dev_err(dev, "get ddc_clk failed: %p ,\n", ddc->clk); > - return PTR_ERR(ddc->clk); > - } > + if (IS_ERR(ddc->clk)) > + return dev_err_probe(dev, PTR_ERR(ddc->clk), > + "get ddc_clk failed\n"); > > ddc->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); > if (IS_ERR(ddc->regs)) > return PTR_ERR(ddc->regs); > > ret = clk_prepare_enable(ddc->clk); > - if (ret) { > - dev_err(dev, "enable ddc clk failed!\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "enable ddc clk failed!\n"); > > strscpy(ddc->adap.name, "mediatek-hdmi-ddc", sizeof(ddc->adap.name)); > ddc->adap.owner = THIS_MODULE; > @@ -304,8 +301,8 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > > ret = i2c_add_adapter(&ddc->adap); > if (ret < 0) { > - dev_err(dev, "failed to add bus to i2c core\n"); > - goto err_clk_disable; > + clk_disable_unprepare(ddc->clk); > + return dev_err_probe(dev, ret, "failed to add bus to i2c core\n"); > } > > platform_set_drvdata(pdev, ddc); > @@ -316,10 +313,6 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > &mem->end); > > return 0; > - > -err_clk_disable: > - clk_disable_unprepare(ddc->clk); > - return ret; > } > > static void mtk_hdmi_ddc_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > index 925cbb7471ec..7c1a8c796833 100644 > --- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > @@ -301,16 +301,14 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) > > 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 rdma\n"); > - return PTR_ERR(priv->regs); > - } > + if (IS_ERR(priv->regs)) > + return dev_err_probe(dev, PTR_ERR(priv->regs), > + "failed to ioremap rdma\n"); > > priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "failed to get rdma clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get rdma clk\n"); > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > @@ -324,9 +322,9 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) > ret = component_add(dev, &mtk_mdp_rdma_component_ops); > if (ret != 0) { > pm_runtime_disable(dev); > - 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_mdp_rdma_remove(struct platform_device *pdev) > diff --git a/drivers/gpu/drm/mediatek/mtk_padding.c b/drivers/gpu/drm/mediatek/mtk_padding.c > index 85bc6768b6bc..bbda590ca76e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_padding.c > +++ b/drivers/gpu/drm/mediatek/mtk_padding.c > @@ -103,23 +103,19 @@ static int mtk_padding_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 clk\n"); > - return PTR_ERR(priv->clk); > - } > + if (IS_ERR(priv->clk)) > + return dev_err_probe(dev, PTR_ERR(priv->clk), > + "failed to get clk\n"); > > priv->reg = devm_platform_get_and_ioremap_resource(pdev, 0, &res); > - if (IS_ERR(priv->reg)) { > - dev_err(dev, "failed to do ioremap\n"); > - return PTR_ERR(priv->reg); > - } > + if (IS_ERR(priv->reg)) > + return dev_err_probe(dev, PTR_ERR(priv->reg), > + "failed to do ioremap\n"); > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > - if (ret) { > - dev_err(dev, "failed to get gce client reg\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to get gce client reg\n"); > #endif > > platform_set_drvdata(pdev, priv); > > --- > base-commit: ee78a17615ad0cfdbbc27182b1047cd36c9d4d5f > change-id: 20240605-mtk-disp-rdma-dev-err-probe-ef9c10a1a91e > > Best regards, > -- > Nícolas F. R. A. Prado <nfraprado@collabora.com> >
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c index 8519e9bade36..2de248443147 100644 --- a/drivers/gpu/drm/mediatek/mtk_cec.c +++ b/drivers/gpu/drm/mediatek/mtk_cec.c @@ -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); diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c index 3ce8f32b06d5..59fb9a08d54b 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c @@ -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) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c index df35e90dd25f..9b75727e0861 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c @@ -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) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c index 7f0085be5671..2fd5e7dc9e24 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c @@ -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) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index ca8d1f3aca03..f0b38817ba6c 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -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) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c index 77c057e0e671..435e5d9c8520 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c @@ -316,22 +316,19 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) 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 merge\n"); - return PTR_ERR(priv->regs); - } + if (IS_ERR(priv->regs)) + return dev_err_probe(dev, PTR_ERR(priv->regs), + "failed to ioremap merge\n"); priv->clk = devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get merge clk\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get merge clk\n"); priv->async_clk = devm_clk_get_optional(dev, "merge_async"); - if (IS_ERR(priv->async_clk)) { - dev_err(dev, "failed to get merge async clock\n"); - return PTR_ERR(priv->async_clk); - } + if (IS_ERR(priv->async_clk)) + return dev_err_probe(dev, PTR_ERR(priv->async_clk), + "failed to get merge async clock\n"); if (priv->async_clk) { priv->reset_ctl = devm_reset_control_get_optional_exclusive(dev, NULL); @@ -354,9 +351,9 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) ret = component_add(dev, &mtk_disp_merge_component_ops); if (ret != 0) - 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_merge_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index b552a02d7eae..4dd8bb8e8457 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -523,17 +523,15 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) return irq; priv->clk = devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get ovl clk\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get ovl 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 ovl\n"); - return PTR_ERR(priv->regs); - } + if (IS_ERR(priv->regs)) + return dev_err_probe(dev, PTR_ERR(priv->regs), + "failed to ioremap ovl\n"); #if IS_REACHABLE(CONFIG_MTK_CMDQ) ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); if (ret) @@ -545,20 +543,18 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, IRQF_TRIGGER_NONE, dev_name(dev), priv); - if (ret < 0) { - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); pm_runtime_enable(dev); ret = component_add(dev, &mtk_disp_ovl_component_ops); if (ret) { pm_runtime_disable(dev); - 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_ovl_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c index 02dd7dcdfedb..0744da867d4e 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c @@ -612,10 +612,10 @@ static int mtk_disp_ovl_adaptor_probe(struct platform_device *pdev) ret = component_add(dev, &mtk_disp_ovl_adaptor_comp_ops); if (ret != 0) { pm_runtime_disable(dev); - 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_ovl_adaptor_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c index 7b1a6e631200..634bbba5d43f 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c @@ -326,17 +326,15 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) return irq; priv->clk = devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get rdma clk\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get rdma 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 rdma\n"); - return PTR_ERR(priv->regs); - } + if (IS_ERR(priv->regs)) + return dev_err_probe(dev, PTR_ERR(priv->regs), + "failed to ioremap rdma\n"); #if IS_REACHABLE(CONFIG_MTK_CMDQ) ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); if (ret) @@ -347,10 +345,9 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) ret = of_property_read_u32(dev->of_node, "mediatek,rdma-fifo-size", &priv->fifo_size); - if (ret) { - dev_err(dev, "Failed to get rdma fifo size\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to get rdma fifo size\n"); } /* Disable and clear pending interrupts */ @@ -359,10 +356,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) ret = devm_request_irq(dev, irq, mtk_disp_rdma_irq_handler, IRQF_TRIGGER_NONE, dev_name(dev), priv); - if (ret < 0) { - dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); priv->data = of_device_get_match_data(dev); @@ -373,10 +368,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) ret = component_add(dev, &mtk_disp_rdma_component_ops); if (ret) { pm_runtime_disable(dev); - 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_rdma_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c index 536366956447..ed335d888b2f 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2655,11 +2655,9 @@ static int mtk_dp_probe(struct platform_device *pdev) mutex_init(&mtk_dp->update_plugged_status_lock); ret = mtk_dp_register_audio_driver(dev); - if (ret) { - dev_err(dev, "Failed to register audio driver: %d\n", - ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to register audio driver\n"); } ret = mtk_dp_register_phy(mtk_dp); diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c index 156c6ff547e8..b367a080500c 100644 --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c @@ -325,25 +325,24 @@ static int mtk_ethdr_probe(struct platform_device *pdev) if (priv->irq) { ret = devm_request_irq(dev, priv->irq, mtk_ethdr_irq_handler, IRQF_TRIGGER_NONE, dev_name(dev), priv); - if (ret < 0) { - dev_err(dev, "Failed to request irq %d: %d\n", priv->irq, ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, + "Failed to request irq %d\n", + priv->irq); } priv->reset_ctl = devm_reset_control_array_get_optional_exclusive(dev); - if (IS_ERR(priv->reset_ctl)) { - dev_err_probe(dev, PTR_ERR(priv->reset_ctl), "cannot get ethdr reset control\n"); - return PTR_ERR(priv->reset_ctl); - } + if (IS_ERR(priv->reset_ctl)) + return dev_err_probe(dev, PTR_ERR(priv->reset_ctl), + "cannot get ethdr reset control\n"); platform_set_drvdata(pdev, priv); ret = component_add(dev, &mtk_ethdr_component_ops); if (ret) - dev_notice(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_ethdr_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 6e1cca97a654..3790d0b433cc 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1713,26 +1713,22 @@ static int mtk_hdmi_probe(struct platform_device *pdev) return ret; hdmi->phy = devm_phy_get(dev, "hdmi"); - if (IS_ERR(hdmi->phy)) { - ret = PTR_ERR(hdmi->phy); - dev_err(dev, "Failed to get HDMI PHY: %d\n", ret); - return ret; - } + if (IS_ERR(hdmi->phy)) + return dev_err_probe(dev, PTR_ERR(hdmi->phy), + "Failed to get HDMI PHY\n"); mutex_init(&hdmi->update_plugged_status_lock); platform_set_drvdata(pdev, hdmi); ret = mtk_hdmi_output_init(hdmi); - if (ret) { - dev_err(dev, "Failed to initialize hdmi output\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to initialize hdmi output\n"); ret = mtk_hdmi_register_audio_driver(dev); - if (ret) { - dev_err(dev, "Failed to register audio driver: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to register audio driver\n"); hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs; hdmi->bridge.of_node = pdev->dev.of_node; @@ -1743,15 +1739,12 @@ static int mtk_hdmi_probe(struct platform_device *pdev) ret = mtk_hdmi_clk_enable_audio(hdmi); if (ret) { - dev_err(dev, "Failed to enable audio clocks: %d\n", ret); - goto err_bridge_remove; + drm_bridge_remove(&hdmi->bridge); + return dev_err_probe(dev, ret, + "Failed to enable audio clocks\n"); } return 0; - -err_bridge_remove: - drm_bridge_remove(&hdmi->bridge); - return ret; } static void mtk_hdmi_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c index 52d55861f954..8e60631d4cd2 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c @@ -279,20 +279,17 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) return -ENOMEM; ddc->clk = devm_clk_get(dev, "ddc-i2c"); - if (IS_ERR(ddc->clk)) { - dev_err(dev, "get ddc_clk failed: %p ,\n", ddc->clk); - return PTR_ERR(ddc->clk); - } + if (IS_ERR(ddc->clk)) + return dev_err_probe(dev, PTR_ERR(ddc->clk), + "get ddc_clk failed\n"); ddc->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); if (IS_ERR(ddc->regs)) return PTR_ERR(ddc->regs); ret = clk_prepare_enable(ddc->clk); - if (ret) { - dev_err(dev, "enable ddc clk failed!\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "enable ddc clk failed!\n"); strscpy(ddc->adap.name, "mediatek-hdmi-ddc", sizeof(ddc->adap.name)); ddc->adap.owner = THIS_MODULE; @@ -304,8 +301,8 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) ret = i2c_add_adapter(&ddc->adap); if (ret < 0) { - dev_err(dev, "failed to add bus to i2c core\n"); - goto err_clk_disable; + clk_disable_unprepare(ddc->clk); + return dev_err_probe(dev, ret, "failed to add bus to i2c core\n"); } platform_set_drvdata(pdev, ddc); @@ -316,10 +313,6 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) &mem->end); return 0; - -err_clk_disable: - clk_disable_unprepare(ddc->clk); - return ret; } static void mtk_hdmi_ddc_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c index 925cbb7471ec..7c1a8c796833 100644 --- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c @@ -301,16 +301,14 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) 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 rdma\n"); - return PTR_ERR(priv->regs); - } + if (IS_ERR(priv->regs)) + return dev_err_probe(dev, PTR_ERR(priv->regs), + "failed to ioremap rdma\n"); priv->clk = devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get rdma clk\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get rdma clk\n"); #if IS_REACHABLE(CONFIG_MTK_CMDQ) ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); @@ -324,9 +322,9 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev) ret = component_add(dev, &mtk_mdp_rdma_component_ops); if (ret != 0) { pm_runtime_disable(dev); - 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_mdp_rdma_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/mediatek/mtk_padding.c b/drivers/gpu/drm/mediatek/mtk_padding.c index 85bc6768b6bc..bbda590ca76e 100644 --- a/drivers/gpu/drm/mediatek/mtk_padding.c +++ b/drivers/gpu/drm/mediatek/mtk_padding.c @@ -103,23 +103,19 @@ static int mtk_padding_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 clk\n"); - return PTR_ERR(priv->clk); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get clk\n"); priv->reg = devm_platform_get_and_ioremap_resource(pdev, 0, &res); - if (IS_ERR(priv->reg)) { - dev_err(dev, "failed to do ioremap\n"); - return PTR_ERR(priv->reg); - } + if (IS_ERR(priv->reg)) + return dev_err_probe(dev, PTR_ERR(priv->reg), + "failed to do ioremap\n"); #if IS_REACHABLE(CONFIG_MTK_CMDQ) ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); - if (ret) { - dev_err(dev, "failed to get gce client reg\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to get gce client reg\n"); #endif platform_set_drvdata(pdev, priv);
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: Nícolas F. R. A. Prado <nfraprado@collabora.com> --- Changes in v2: - Converted all dev_err() in probe functions to dev_err_probe() instead of just the ones in the component_add() error path - Link to v1: https://lore.kernel.org/r/20240605-mtk-disp-rdma-dev-err-probe-v1-1-91259e1d3a93@collabora.com --- drivers/gpu/drm/mediatek/mtk_cec.c | 28 ++++++++-------------- drivers/gpu/drm/mediatek/mtk_disp_aal.c | 18 +++++++------- drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 18 +++++++------- drivers/gpu/drm/mediatek/mtk_disp_color.c | 18 +++++++------- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 18 +++++++------- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 25 +++++++++----------- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 24 ++++++++----------- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 31 +++++++++++-------------- drivers/gpu/drm/mediatek/mtk_dp.c | 8 +++---- drivers/gpu/drm/mediatek/mtk_ethdr.c | 19 +++++++-------- drivers/gpu/drm/mediatek/mtk_hdmi.c | 31 ++++++++++--------------- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 21 ++++++----------- drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 18 +++++++------- drivers/gpu/drm/mediatek/mtk_padding.c | 20 +++++++--------- 15 files changed, 125 insertions(+), 176 deletions(-) --- base-commit: ee78a17615ad0cfdbbc27182b1047cd36c9d4d5f change-id: 20240605-mtk-disp-rdma-dev-err-probe-ef9c10a1a91e Best regards,