2 files changed, 5 insertions, 13 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2b502f6cc6d0..838e03778b58 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1668,13 +1668,8 @@ void snd_soc_of_parse_audio_prefix_from_node(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,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f1901bb1466e..e30984fd649b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3690,17 +3690,14 @@ void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);
 
-int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
-                                   struct device_node *np,
+int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname)
 {
+        struct device_node *np = card->dev->of_node;
         int num_routes;
         struct snd_soc_dapm_route *routes;
         int i, ret;
 
-        if (!np)
-                np = card->dev->of_node;
-
         num_routes = of_property_count_strings(np, propname);
         if (num_routes < 0 || num_routes & 1) {
                 dev_err(card->dev,
@@ -3747,7 +3744,7 @@ int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing_from_node);
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);
 
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                      const char *prefix,