Bladeren bron

ASoC: core - Improve card registration error messaging for large DAI links.

Print out the offending DAI link entry when a naming error occurs. Makes
thing easier to debug for machines with a large number of DAI links.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Liam Girdwood 13 jaren geleden
bovenliggende
commit
3b09bb820d
1 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 5 3
      sound/soc/soc-core.c

+ 5 - 3
sound/soc/soc-core.c

@@ -2864,7 +2864,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
 		 */
 		 */
 		if (!!link->codec_name == !!link->codec_of_node) {
 		if (!!link->codec_name == !!link->codec_of_node) {
 			dev_err(card->dev,
 			dev_err(card->dev,
-				"Neither/both codec name/of_node are set\n");
+				"Neither/both codec name/of_node are set for %s\n",
+				link->name);
 			return -EINVAL;
 			return -EINVAL;
 		}
 		}
 
 
@@ -2874,7 +2875,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
 		 */
 		 */
 		if (link->platform_name && link->platform_of_node) {
 		if (link->platform_name && link->platform_of_node) {
 			dev_err(card->dev,
 			dev_err(card->dev,
-				"Both platform name/of_node are set\n");
+				"Both platform name/of_node are set for %s\n", link->name);
 			return -EINVAL;
 			return -EINVAL;
 		}
 		}
 
 
@@ -2884,7 +2885,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
 		 */
 		 */
 		if (!!link->cpu_dai_name == !!link->cpu_dai_of_node) {
 		if (!!link->cpu_dai_name == !!link->cpu_dai_of_node) {
 			dev_err(card->dev,
 			dev_err(card->dev,
-				"Neither/both cpu_dai name/of_node are set\n");
+				"Neither/both cpu_dai name/of_node are set for %s\n",
+				link->name);
 			return -EINVAL;
 			return -EINVAL;
 		}
 		}
 	}
 	}