Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / include / sound / simple_card_utils.h

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index a71d46a95ca8d52a1b9049a37014280315cbf1ab..fd6412551145a8df0c003c6b4b190b5c34b0f91f 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -27,6 +27,7 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
                                  struct device_node *codec,
                                  char *prefix,
                                  unsigned int *retfmt);
+__printf(3, 4)
 int asoc_simple_card_set_dailink_name(struct device *dev,
                                      struct snd_soc_dai_link *dai_link,
                                      const char *fmt, ...);
@@ -62,5 +63,9 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
                              struct asoc_simple_dai *simple_dai);
 
 int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+                                     int is_single_links);
+
+int asoc_simple_card_clean_reference(struct snd_soc_card *card);
 
 #endif /* __SIMPLE_CARD_CORE_H */