diff options
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 9 |
1 files changed, 3 insertions, 6 deletions
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, | |||
3690 | } | 3690 | } |
3691 | EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node); | 3691 | EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node); |
3692 | 3692 | ||
3693 | int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card, | 3693 | int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, |
3694 | struct device_node *np, | ||
3695 | const char *propname) | 3694 | const char *propname) |
3696 | { | 3695 | { |
3696 | struct device_node *np = card->dev->of_node; | ||
3697 | int num_routes; | 3697 | int num_routes; |
3698 | struct snd_soc_dapm_route *routes; | 3698 | struct snd_soc_dapm_route *routes; |
3699 | int i, ret; | 3699 | int i, ret; |
3700 | 3700 | ||
3701 | if (!np) | ||
3702 | np = card->dev->of_node; | ||
3703 | |||
3704 | num_routes = of_property_count_strings(np, propname); | 3701 | num_routes = of_property_count_strings(np, propname); |
3705 | if (num_routes < 0 || num_routes & 1) { | 3702 | if (num_routes < 0 || num_routes & 1) { |
3706 | dev_err(card->dev, | 3703 | dev_err(card->dev, |
@@ -3747,7 +3744,7 @@ int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card, | |||
3747 | 3744 | ||
3748 | return 0; | 3745 | return 0; |
3749 | } | 3746 | } |
3750 | EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing_from_node); | 3747 | EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing); |
3751 | 3748 | ||
3752 | unsigned int snd_soc_of_parse_daifmt(struct device_node *np, | 3749 | unsigned int snd_soc_of_parse_daifmt(struct device_node *np, |
3753 | const char *prefix, | 3750 | const char *prefix, |