ASoC: qcom: Use dev_err_probe() helper
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 14 Dec 2021 02:08:39 +0000 (11:08 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 20 Dec 2021 12:47:20 +0000 (12:47 +0000)
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-19-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/common.c

index 2e1c618..e1bf04d 100644 (file)
@@ -94,9 +94,8 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
 
                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;
                }
 
@@ -116,9 +115,8 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                if (codec) {
                        ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
                        if (ret < 0) {
-                               if (ret != -EPROBE_DEFER)
-                                       dev_err(card->dev, "%s: codec dai not found: %d\n",
-                                               link->name, ret);
+                               dev_err_probe(card->dev, ret,
+                                             "%s: codec dai not found\n", link->name);
                                goto err;
                        }