ASoC: qcom: common: Include link-name in error messages

Reading out the link-name earlier and including it in the various error
messages makes it much more convenient to figure out what links have
unmet dependencies.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20190905040306.21399-1-bjorn.andersson@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index 2c7348ddbbb3b3ae050057cd45ca2995e2e26d7f..6c20bdd850f3319ab3b9b93c44bf4f873692b1dc 100644 (file)
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -53,12 +53,18 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                link->num_cpus          = 1;
                link->num_platforms     = 1;
 
+               ret = of_property_read_string(np, "link-name", &link->name);
+               if (ret) {
+                       dev_err(card->dev, "error getting codec dai_link name\n");
+                       goto err;
+               }
+
                cpu = of_get_child_by_name(np, "cpu");
                platform = of_get_child_by_name(np, "platform");
                codec = of_get_child_by_name(np, "codec");
 
                if (!cpu) {
-                       dev_err(dev, "Can't find cpu DT node\n");
+                       dev_err(dev, "%s: Can't find cpu DT node\n", link->name);
                        ret = -EINVAL;
                        goto err;
                }
@@ -66,7 +72,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                ret = of_parse_phandle_with_args(cpu, "sound-dai",
                                        "#sound-dai-cells", 0, &args);
                if (ret) {
-                       dev_err(card->dev, "error getting cpu phandle\n");
+                       dev_err(card->dev, "%s: error getting cpu phandle\n", link->name);
                        goto err;
                }
                link->cpus->of_node = args.np;
@@ -74,7 +80,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
 
                ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
                if (ret) {
-                       dev_err(card->dev, "error getting cpu dai name\n");
+                       dev_err(card->dev, "%s: error getting cpu dai name\n", link->name);
                        goto err;
                }
 
@@ -83,14 +89,14 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                                        "sound-dai",
                                        0);
                        if (!link->platforms->of_node) {
-                               dev_err(card->dev, "platform dai not found\n");
+                               dev_err(card->dev, "%s: platform dai not found\n", link->name);
                                ret = -EINVAL;
                                goto err;
                        }
 
                        ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
                        if (ret < 0) {
-                               dev_err(card->dev, "codec dai not found\n");
+                               dev_err(card->dev, "%s: codec dai not found\n", link->name);
                                goto err;
                        }
                        link->no_pcm = 1;
@@ -110,12 +116,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                }
 
                link->ignore_suspend = 1;
-               ret = of_property_read_string(np, "link-name", &link->name);
-               if (ret) {
-                       dev_err(card->dev, "error getting codec dai_link name\n");
-                       goto err;
-               }
-
                link->nonatomic = 1;
                link->dpcm_playback = 1;
                link->dpcm_capture = 1;