diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-24 21:57:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-01 16:21:39 -0400 |
commit | 83216f3acc4ab42ffe7001b54cd62f7ca2bde30f (patch) | |
tree | c403bb7aa26811c5f4e162ca98f0dccaa1c44a4d | |
parent | 112a2ab5a720279d0805018a9ee162e12b0ce463 (diff) |
ASoC: simple-scu-card: tidyup asoc_simple_card_parse_links() method
Current asoc_simple_card_parse_links() is setting dai_link daifmt.
But, asoc_simple_card_parse_links() is doing it.
This patch clean-up this point less method
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-scu-card.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 83add148722f..2f40f9c2927c 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c | |||
@@ -110,6 +110,7 @@ static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, | |||
110 | 110 | ||
111 | static int asoc_simple_card_parse_links(struct device_node *np, | 111 | static int asoc_simple_card_parse_links(struct device_node *np, |
112 | struct asoc_simple_card_priv *priv, | 112 | struct asoc_simple_card_priv *priv, |
113 | unsigned int daifmt, | ||
113 | int idx, bool is_fe) | 114 | int idx, bool is_fe) |
114 | { | 115 | { |
115 | struct device *dev = simple_priv_to_dev(priv); | 116 | struct device *dev = simple_priv_to_dev(priv); |
@@ -188,6 +189,7 @@ static int asoc_simple_card_parse_links(struct device_node *np, | |||
188 | if (ret < 0) | 189 | if (ret < 0) |
189 | return ret; | 190 | return ret; |
190 | 191 | ||
192 | dai_link->dai_fmt = daifmt; | ||
191 | dai_link->dpcm_playback = 1; | 193 | dai_link->dpcm_playback = 1; |
192 | dai_link->dpcm_capture = 1; | 194 | dai_link->dpcm_capture = 1; |
193 | dai_link->ops = &asoc_simple_card_ops; | 195 | dai_link->ops = &asoc_simple_card_ops; |
@@ -205,7 +207,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, | |||
205 | struct asoc_simple_card_priv *priv) | 207 | struct asoc_simple_card_priv *priv) |
206 | { | 208 | { |
207 | struct device *dev = simple_priv_to_dev(priv); | 209 | struct device *dev = simple_priv_to_dev(priv); |
208 | struct snd_soc_dai_link *dai_link; | ||
209 | struct device_node *np; | 210 | struct device_node *np; |
210 | unsigned int daifmt = 0; | 211 | unsigned int daifmt = 0; |
211 | int ret, i; | 212 | int ret, i; |
@@ -223,14 +224,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, | |||
223 | 224 | ||
224 | i = 0; | 225 | i = 0; |
225 | for_each_child_of_node(node, np) { | 226 | for_each_child_of_node(node, np) { |
226 | dai_link = simple_priv_to_link(priv, i); | ||
227 | dai_link->dai_fmt = daifmt; | ||
228 | |||
229 | is_fe = false; | 227 | is_fe = false; |
230 | if (strcmp(np->name, PREFIX "cpu") == 0) | 228 | if (strcmp(np->name, PREFIX "cpu") == 0) |
231 | is_fe = true; | 229 | is_fe = true; |
232 | 230 | ||
233 | ret = asoc_simple_card_parse_links(np, priv, i, is_fe); | 231 | ret = asoc_simple_card_parse_links(np, priv, daifmt, i, is_fe); |
234 | if (ret < 0) | 232 | if (ret < 0) |
235 | return ret; | 233 | return ret; |
236 | i++; | 234 | i++; |