diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-08-27 23:07:46 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-08-29 07:49:34 -0400 |
commit | 2d82eeb02655e32358efd42598d8276284c23364 (patch) | |
tree | c278b4f98313ca9c0d64460ef982fc7cee9800ac /sound/soc/generic/simple-card.c | |
parent | 8ea21348868f37f5b2e6ebbaf336d2a415b2b9ff (diff) |
ASoC: simple-card: use asoc_simple_xxx prefix
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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic/simple-card.c')
-rw-r--r-- | sound/soc/generic/simple-card.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 21b0ea24bc1d..c5445b0ae9ff 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, | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | static int simple_card_dai_link_of(struct device_node *node, | 166 | static int asoc_simple_card_dai_link_of(struct device_node *node, |
167 | struct device *dev, | 167 | struct device *dev, |
168 | struct snd_soc_dai_link *dai_link, | 168 | struct snd_soc_dai_link *dai_link, |
169 | struct simple_dai_props *dai_props, | 169 | struct simple_dai_props *dai_props, |
170 | bool is_top_level_node) | 170 | bool is_top_level_node) |
171 | { | 171 | { |
172 | struct device_node *np = NULL; | 172 | struct device_node *np = NULL; |
173 | struct device_node *bitclkmaster = NULL; | 173 | struct device_node *bitclkmaster = NULL; |
@@ -337,16 +337,18 @@ static int asoc_simple_card_parse_of(struct device_node *node, | |||
337 | int i; | 337 | int i; |
338 | for (i = 0; (np = of_get_next_child(node, np)); i++) { | 338 | for (i = 0; (np = of_get_next_child(node, np)); i++) { |
339 | dev_dbg(dev, "\tlink %d:\n", i); | 339 | dev_dbg(dev, "\tlink %d:\n", i); |
340 | ret = simple_card_dai_link_of(np, dev, dai_link + i, | 340 | ret = asoc_simple_card_dai_link_of(np, dev, |
341 | dai_props + i, false); | 341 | dai_link + i, |
342 | dai_props + i, | ||
343 | false); | ||
342 | if (ret < 0) { | 344 | if (ret < 0) { |
343 | of_node_put(np); | 345 | of_node_put(np); |
344 | return ret; | 346 | return ret; |
345 | } | 347 | } |
346 | } | 348 | } |
347 | } else { | 349 | } else { |
348 | ret = simple_card_dai_link_of(node, dev, dai_link, dai_props, | 350 | ret = asoc_simple_card_dai_link_of(node, dev, |
349 | true); | 351 | dai_link, dai_props, true); |
350 | if (ret < 0) | 352 | if (ret < 0) |
351 | return ret; | 353 | return ret; |
352 | } | 354 | } |