From: Kuninori Morimoto <[email protected]>

simple-card driver is using asoc_simple_xxx() prefix.
simple_card_dai_link_of() should be
asoc_simple_card_dai_link_of().

Signed-off-by: Kuninori Morimoto <[email protected]>
---
 sound/soc/generic/simple-card.c |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 159e517f..f60c68d 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -163,11 +163,11 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
        return 0;
 }
 
-static int simple_card_dai_link_of(struct device_node *node,
-                                  struct device *dev,
-                                  struct snd_soc_dai_link *dai_link,
-                                  struct simple_dai_props *dai_props,
-                                  bool is_top_level_node)
+static int asoc_simple_card_dai_link_of(struct device_node *node,
+                                       struct device *dev,
+                                       struct snd_soc_dai_link *dai_link,
+                                       struct simple_dai_props *dai_props,
+                                       bool is_top_level_node)
 {
        struct device_node *np = NULL;
        struct device_node *bitclkmaster = NULL;
@@ -337,16 +337,18 @@ static int asoc_simple_card_parse_of(struct device_node 
*node,
                int i;
                for (i = 0; (np = of_get_next_child(node, np)); i++) {
                        dev_dbg(dev, "\tlink %d:\n", i);
-                       ret = simple_card_dai_link_of(np, dev, dai_link + i,
-                                                     dai_props + i, false);
+                       ret = asoc_simple_card_dai_link_of(np, dev,
+                                                          dai_link + i,
+                                                          dai_props + i,
+                                                          false);
                        if (ret < 0) {
                                of_node_put(np);
                                return ret;
                        }
                }
        } else {
-               ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,
-                                             true);
+               ret = asoc_simple_card_dai_link_of(node, dev,
+                                                  dai_link, dai_props, true);
                if (ret < 0)
                        return ret;
        }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to