diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-08-27 23:08:47 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-08-29 07:51:02 -0400 |
commit | a44a750e5299fe2ece5aa68e8562dd6e2c2b16f4 (patch) | |
tree | 90b9f04412bacf2663234383a078e90890e6db3f | |
parent | a5960bd5984c808cdf7aa528e162e9e20e61b923 (diff) |
ASoC: simple-card: use common for_each_child_of_node() for loop
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/generic/simple-card.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 89027047364f..fd8b04588948 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c | |||
@@ -346,8 +346,9 @@ static int asoc_simple_card_parse_of(struct device_node *node, | |||
346 | 346 | ||
347 | if (multi) { | 347 | if (multi) { |
348 | struct device_node *np = NULL; | 348 | struct device_node *np = NULL; |
349 | int i; | 349 | int i = 0; |
350 | for (i = 0; (np = of_get_next_child(node, np)); i++) { | 350 | |
351 | for_each_child_of_node(node, np) { | ||
351 | dev_dbg(dev, "\tlink %d:\n", i); | 352 | dev_dbg(dev, "\tlink %d:\n", i); |
352 | ret = asoc_simple_card_dai_link_of(np, dev, | 353 | ret = asoc_simple_card_dai_link_of(np, dev, |
353 | dai_link + i, | 354 | dai_link + i, |
@@ -357,6 +358,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, | |||
357 | of_node_put(np); | 358 | of_node_put(np); |
358 | return ret; | 359 | return ret; |
359 | } | 360 | } |
361 | i++; | ||
360 | } | 362 | } |
361 | } else { | 363 | } else { |
362 | ret = asoc_simple_card_dai_link_of(node, dev, | 364 | ret = asoc_simple_card_dai_link_of(node, dev, |