Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic...

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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index c6cabf3daebea64c310067b91b62bc83d8018a8f..cdfb55f7aedeac2b0ee6a7f5f7b4bf81da123ddf 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1645,37 +1645,21 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
-#define snd_soc_of_parse_card_name(card, propname) \
-       snd_soc_of_parse_card_name_from_node(card, NULL, propname)
-int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,
-                                        struct device_node *np,
-                                        const char *propname);
-#define snd_soc_of_parse_audio_simple_widgets(card, propname)\
-       snd_soc_of_parse_audio_simple_widgets_from_node(card, NULL, propname)
-int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card,
-                                                   struct device_node *np,
-                                                   const char *propname);
-
+int snd_soc_of_parse_card_name(struct snd_soc_card *card,
+                              const char *propname);
+int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
+                                         const char *propname);
 int snd_soc_of_parse_tdm_slot(struct device_node *np,
                              unsigned int *tx_mask,
                              unsigned int *rx_mask,
                              unsigned int *slots,
                              unsigned int *slot_width);
-#define snd_soc_of_parse_audio_prefix(card, codec_conf, of_node, propname) \
-       snd_soc_of_parse_audio_prefix_from_node(card, NULL, codec_conf, \
-                                               of_node, propname)
-void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
-                                  struct device_node *np,
+void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
                                   struct snd_soc_codec_conf *codec_conf,
                                   struct device_node *of_node,
                                   const char *propname);
-
-#define snd_soc_of_parse_audio_routing(card, propname) \
-       snd_soc_of_parse_audio_routing_from_node(card, NULL, propname)
-int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
-                                            struct device_node *np,
-                                            const char *propname);
-
+int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
+                                  const char *propname);
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                     const char *prefix,
                                     struct device_node **bitclkmaster,