ASoC: simple-card-utils: add asoc_simple_card_parse_card_name()

simple-card needs to get its card name.
This patch makes this method simple style standard.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index b88a8dc..86088ae 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -30,5 +30,7 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
 int asoc_simple_card_set_dailink_name(struct device *dev,
                                      struct snd_soc_dai_link *dai_link,
                                      const char *fmt, ...);
+int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
+                                    char *prefix);
 
 #endif /* __SIMPLE_CARD_CORE_H */

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 48c7366..d89a9a1 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -75,3 +75,23 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
        return ret;
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name);
+
+int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
+                                    char *prefix)
+{
+       char prop[128];
+       int ret;
+
+       snprintf(prop, sizeof(prop), "%sname", prefix);
+
+       /* Parse the card name from DT */
+       ret = snd_soc_of_parse_card_name(card, prop);
+       if (ret < 0)
+               return ret;
+
+       if (!card->name && card->dai_link)
+               card->name = card->dai_link->name;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);