ASoC: fsl: Use dev_err_probe() helper

[ Upstream commit 2e6f557ca35aa330dbf31c5e1cc8119eff1526fa ]

Use the dev_err_probe() helper, instead of open-coding the same
operation.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20211214020843.2225831-14-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 06107ae46e20b3dc0b6368c6592c05742bb0a4c3..95286c839b57f26ef899770b9172482648e7b4f3 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -842,8 +842,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(&pdev->dev, &priv->card);
        if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+               dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
                goto asrc_fail;
        }
 

diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index db947180617a6cec44510287e351387671cd444e..55bc1bb0dbbd388ca6c1a5f699112b1f7cb1284e 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -579,9 +579,8 @@ static int imx_card_parse_of(struct imx_card_data *data)
 
                ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
                if (ret) {
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(card->dev, "%s: error getting cpu dai name: %d\n",
-                                       link->name, ret);
+                       dev_err_probe(card->dev, ret,
+                                     "%s: error getting cpu dai name\n", link->name);
                        goto err;
                }
 
@@ -589,9 +588,8 @@ static int imx_card_parse_of(struct imx_card_data *data)
                if (codec) {
                        ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
                        if (ret < 0) {
-                               if (ret != -EPROBE_DEFER)
-                                       dev_err(dev, "%s: codec dai not found: %d\n",
-                                               link->name, ret);
+                               dev_err_probe(dev, ret, "%s: codec dai not found\n",
+                                               link->name);
                                goto err;
                        }
 
@@ -830,11 +828,8 @@ static int imx_card_probe(struct platform_device *pdev)
        }
 
        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
 
        return 0;
 }

diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index f45cb4bbb6c4d1bef0f65b4c2ddfcf9ac2c8cd58..52bb1844f5487de8018210ad136110872db6ca63 100644 (file)
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -173,9 +173,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
        if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
-                               ret);
+               dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
                goto fail;
        }
 

diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
index 6c4dadf60355102b8b0eebab275f4088b41b6181..4446fba755b9afbac7b8a1cc254a65e54419aa7a 100644 (file)
--- a/sound/soc/fsl/imx-spdif.c
+++ b/sound/soc/fsl/imx-spdif.c
@@ -70,8 +70,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
                goto end;
 
        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
-       if (ret && ret != -EPROBE_DEFER)
-               dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
+       if (ret)
+               dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
 
 end:
        of_node_put(spdif_np);