Skip to content

Commit

Permalink
ASoC: audio-graph: tidyup graph_dai_link_of_dpcm()
Browse files Browse the repository at this point in the history
Use local variable at local area only.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a6psi417.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Apr 21, 2021
1 parent 4343922 commit 73371ba
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions sound/soc/generic/audio-graph-card.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,24 +276,19 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
struct link_info *li)
{
struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_card *card = simple_priv_to_card(priv);
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
struct device_node *top = dev->of_node;
struct device_node *ep = li->cpu ? cpu_ep : codec_ep;
struct device_node *port;
struct device_node *ports;
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);
char dai_name[64];
int ret;

port = of_get_parent(ep);
ports = of_get_parent(port);

dev_dbg(dev, "link_of DPCM (%pOF)\n", ep);

if (li->cpu) {
struct snd_soc_card *card = simple_priv_to_card(priv);
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);

/* Codec is dummy */

/* FE settings */
Expand All @@ -302,7 +297,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,

ret = graph_parse_node(priv, cpu_ep, li, 1);
if (ret)
goto out_put_node;
return ret;

snprintf(dai_name, sizeof(dai_name),
"fe.%pOFP.%s", cpus->of_node, cpus->dai_name);
Expand All @@ -319,30 +314,36 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
if (card->component_chaining && !soc_component_is_pcm(cpus))
dai_link->no_pcm = 1;
} else {
struct snd_soc_codec_conf *cconf;
struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0);
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);
struct device_node *port;
struct device_node *ports;

/* CPU is dummy */

/* BE settings */
dai_link->no_pcm = 1;
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup;

cconf = simple_props_to_codec_conf(dai_props, 0);

ret = graph_parse_node(priv, codec_ep, li, 0);
if (ret < 0)
goto out_put_node;
return ret;

snprintf(dai_name, sizeof(dai_name),
"be.%pOFP.%s", codecs->of_node, codecs->dai_name);

/* check "prefix" from top node */
port = of_get_parent(ep);
ports = of_get_parent(port);
snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
"prefix");
if (of_node_name_eq(ports, "ports"))
snd_soc_of_parse_node_prefix(ports, cconf, codecs->of_node, "prefix");
snd_soc_of_parse_node_prefix(port, cconf, codecs->of_node,
"prefix");

of_node_put(ports);
of_node_put(port);
}

graph_parse_convert(dev, ep, &dai_props->adata);
Expand All @@ -351,11 +352,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,

ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);

out_put_node:
li->link++;

of_node_put(ports);
of_node_put(port);
return ret;
}

Expand Down

0 comments on commit 73371ba

Please sign in to comment.