p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Kuninori Morimoto 2019-03-18 13:50:25 +09:00 committed by Mark Brown
parent d708d35ef0
commit d2bf008ad1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 6 deletions
sound/soc/generic
audio-graph-card.c

16
sound/soc/generic/audio-graph-card.c
View File

@ -176,9 +176,9 @@ static int graph_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
return 0;
}
static void graph_get_conversion(struct device *dev,
struct device_node *ep,
struct asoc_simple_card_data *adata)
static void graph_parse_convert(struct device *dev,
struct device_node *ep,
struct asoc_simple_card_data *adata)
{
struct device_node *top = dev->of_node;
struct device_node *port = of_get_parent(ep);
@ -190,6 +190,10 @@ static void graph_get_conversion(struct device *dev,
asoc_simple_card_parse_convert(dev, ports, NULL, adata);
asoc_simple_card_parse_convert(dev, port, NULL, adata);
asoc_simple_card_parse_convert(dev, ep, NULL, adata);
of_node_put(port);
of_node_put(ports);
of_node_put(node);
}
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,
of_property_read_u32(port, "mclk-fs", &dai_props->mclk_fs);
of_property_read_u32(ep, "mclk-fs", &dai_props->mclk_fs);
graph_get_conversion(dev, ep, &dai_props->adata);
graph_parse_convert(dev, ep, &dai_props->adata);
of_node_put(ports);
of_node_put(port);
@ -462,8 +466,8 @@ static int graph_for_each_link(struct graph_priv *priv,
/* get convert-xxx property */
memset(&adata, 0, sizeof(adata));
graph_get_conversion(dev, codec_ep, &adata);
graph_get_conversion(dev, cpu_ep, &adata);
graph_parse_convert(dev, codec_ep, &adata);
graph_parse_convert(dev, cpu_ep, &adata);
/*
* It is DPCM