ASoC: generic: 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-15-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 7eb027238327839c99bf0ffc82e76adadaaff74f..2b598af8feef8977e05f4b1e6cc97d23f48a70c0 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -593,10 +593,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
 err:
        asoc_simple_clean_reference(card);
 
-       if (ret != -EPROBE_DEFER)
-               dev_err(dev, "parse error %d\n", ret);
-
-       return ret;
+       return dev_err_probe(dev, ret, "parse error\n");
 }
 EXPORT_SYMBOL_GPL(audio_graph_parse_of);
 

diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index b6049bcfb771efc2d6d8dad3f6597ee5047c4b08..c3947347dda3573c8363b4b4ee4ce24baafc1bfb 100644 (file)
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -1238,8 +1238,8 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
 err:
        devm_kfree(dev, li);
 
-       if ((ret < 0) && (ret != -EPROBE_DEFER))
-               dev_err(dev, "parse error %d\n", ret);
+       if (ret < 0)
+               dev_err_probe(dev, ret, "parse error\n");
 
        return ret;
 }

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index a3a7990b5cb66169e0f606660a65c6e9c513c1b7..a89d1cfdda327e3c5d115625008a488e0f1b26ff 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -642,8 +642,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
 
                ret = simple_parse_of(priv, li);
                if (ret < 0) {
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev, "parse error %d\n", ret);
+                       dev_err_probe(dev, ret, "parse error\n");
                        goto err;
                }