ASoC: fsl: Use dev_err_probe() helper

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>

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 90cbed496f98fb9818e8b12903eaf66a7eeb4bb7..5ee94550528135113d892dbdcff6d1d5c4d0865c 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -853,8 +853,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 6f06afd23b16ae8f5696bf7eb4179d01bde0f339..e758c4f1b0bc7e7e9fbb04c2a058ff3a60e7659d 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -563,9 +563,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;
                }
 
@@ -573,9 +572,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;
                        }
 
@@ -814,11 +812,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 2f1acd0110426a5f3d0440d4cb060520866bb09d..8daced42d55e4508396083d389de2965090f35f1 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);