From: bui duc phuc <[email protected]> Use dev_err_probe() when retrieving clocks to avoid logging errors for deferred probes. Also remove redundant error messages from the probe function when failures are already reported deeper in the call chain.
Signed-off-by: bui duc phuc <[email protected]> --- sound/soc/fsl/fsl_asrc.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index faf348dd582d..055593d5d37b 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -1301,22 +1301,18 @@ static int fsl_asrc_probe(struct platform_device *pdev) ret = devm_request_irq(&pdev->dev, irq, fsl_asrc_isr, 0, dev_name(&pdev->dev), asrc); - if (ret) { - dev_err(&pdev->dev, "failed to claim irq %u: %d\n", irq, ret); + if (ret) return ret; - } asrc->mem_clk = devm_clk_get(&pdev->dev, "mem"); - if (IS_ERR(asrc->mem_clk)) { - dev_err(&pdev->dev, "failed to get mem clock\n"); - return PTR_ERR(asrc->mem_clk); - } + if (IS_ERR(asrc->mem_clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(asrc->mem_clk), + "failed to get mem clock\n"); asrc->ipg_clk = devm_clk_get(&pdev->dev, "ipg"); - if (IS_ERR(asrc->ipg_clk)) { - dev_err(&pdev->dev, "failed to get ipg clock\n"); - return PTR_ERR(asrc->ipg_clk); - } + if (IS_ERR(asrc->ipg_clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(asrc->ipg_clk), + "failed to get ipg clock\n"); asrc->spba_clk = devm_clk_get(&pdev->dev, "spba"); if (IS_ERR(asrc->spba_clk)) @@ -1325,10 +1321,9 @@ static int fsl_asrc_probe(struct platform_device *pdev) for (i = 0; i < ASRC_CLK_MAX_NUM; i++) { sprintf(tmp, "asrck_%x", i); asrc_priv->asrck_clk[i] = devm_clk_get(&pdev->dev, tmp); - if (IS_ERR(asrc_priv->asrck_clk[i])) { - dev_err(&pdev->dev, "failed to get %s clock\n", tmp); - return PTR_ERR(asrc_priv->asrck_clk[i]); - } + if (IS_ERR(asrc_priv->asrck_clk[i])) + return dev_err_probe(&pdev->dev, PTR_ERR(asrc_priv->asrck_clk[i]), + "failed to get %s clock\n", tmp); } asrc_priv->soc = of_device_get_match_data(&pdev->dev); @@ -1443,10 +1438,8 @@ static int fsl_asrc_probe(struct platform_device *pdev) ret = devm_snd_soc_register_component(&pdev->dev, &fsl_asrc_component, fsl_asrc_dai, ARRAY_SIZE(fsl_asrc_dai)); - if (ret) { - dev_err(&pdev->dev, "failed to register ASoC DAI\n"); + if (ret) goto err_pm_get_sync; - } ret = fsl_asrc_m2m_init(asrc); if (ret) { -- 2.43.0
