diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-03-18 00:50:25 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-18 10:45:00 -0400 |
commit | d2bf008ad11abc52d6e084bc109be2ee34a74a14 (patch) | |
tree | 43625eca0f5885c65225285baf03f9c557e1a5cb /sound/soc/generic | |
parent | d708d35ef084535ba1a06d0c0f858e18a5edef5a (diff) |
ASoC: audio-graph: rename graph_get_conversion() to graph_parse_convert()
use same naming rule, and this patch add missing of_node_put() on it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r-- | sound/soc/generic/audio-graph-card.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index bb12351330e8..733ba1e89dd6 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c | |||
@@ -176,9 +176,9 @@ static int graph_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static void graph_get_conversion(struct device *dev, | 179 | static void graph_parse_convert(struct device *dev, |
180 | struct device_node *ep, | 180 | struct device_node *ep, |
181 | struct asoc_simple_card_data *adata) | 181 | struct asoc_simple_card_data *adata) |
182 | { | 182 | { |
183 | struct device_node *top = dev->of_node; | 183 | struct device_node *top = dev->of_node; |
184 | struct device_node *port = of_get_parent(ep); | 184 | struct device_node *port = of_get_parent(ep); |
@@ -190,6 +190,10 @@ static void graph_get_conversion(struct device *dev, | |||
190 | asoc_simple_card_parse_convert(dev, ports, NULL, adata); | 190 | asoc_simple_card_parse_convert(dev, ports, NULL, adata); |
191 | asoc_simple_card_parse_convert(dev, port, NULL, adata); | 191 | asoc_simple_card_parse_convert(dev, port, NULL, adata); |
192 | asoc_simple_card_parse_convert(dev, ep, NULL, adata); | 192 | asoc_simple_card_parse_convert(dev, ep, NULL, adata); |
193 | |||
194 | of_node_put(port); | ||
195 | of_node_put(ports); | ||
196 | of_node_put(node); | ||
193 | } | 197 | } |
194 | 198 | ||
195 | static int graph_dai_link_of_dpcm(struct graph_priv *priv, | 199 | static int graph_dai_link_of_dpcm(struct graph_priv *priv, |
@@ -227,7 +231,7 @@ static int graph_dai_link_of_dpcm(struct graph_priv *priv, | |||
227 | of_property_read_u32(port, "mclk-fs", &dai_props->mclk_fs); | 231 | of_property_read_u32(port, "mclk-fs", &dai_props->mclk_fs); |
228 | of_property_read_u32(ep, "mclk-fs", &dai_props->mclk_fs); | 232 | of_property_read_u32(ep, "mclk-fs", &dai_props->mclk_fs); |
229 | 233 | ||
230 | graph_get_conversion(dev, ep, &dai_props->adata); | 234 | graph_parse_convert(dev, ep, &dai_props->adata); |
231 | 235 | ||
232 | of_node_put(ports); | 236 | of_node_put(ports); |
233 | of_node_put(port); | 237 | of_node_put(port); |
@@ -462,8 +466,8 @@ static int graph_for_each_link(struct graph_priv *priv, | |||
462 | 466 | ||
463 | /* get convert-xxx property */ | 467 | /* get convert-xxx property */ |
464 | memset(&adata, 0, sizeof(adata)); | 468 | memset(&adata, 0, sizeof(adata)); |
465 | graph_get_conversion(dev, codec_ep, &adata); | 469 | graph_parse_convert(dev, codec_ep, &adata); |
466 | graph_get_conversion(dev, cpu_ep, &adata); | 470 | graph_parse_convert(dev, cpu_ep, &adata); |
467 | 471 | ||
468 | /* | 472 | /* |
469 | * It is DPCM | 473 | * It is DPCM |