Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic...

[mirror_ubuntu-zesty-kernel.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a765c684bd7b3d7d5d792f2e89ca771a7efa57c7..b4fca9aed2a2b00296ce040428b830b93095d562 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -785,7 +785,6 @@ struct snd_soc_codec {
        struct device *dev;
        const struct snd_soc_codec_driver *driver;
 
-       struct mutex mutex;
        struct list_head list;
        struct list_head card_list;
 
@@ -1497,6 +1496,9 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                     struct device_node **framemaster);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                            const char **dai_name);
+int snd_soc_of_get_dai_link_codecs(struct device *dev,
+                                  struct device_node *of_node,
+                                  struct snd_soc_dai_link *dai_link);
 
 #include <sound/soc-dai.h>