leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rsnd: synchronize connection check for simple-card/audio-graph

Browse Source 
Current rsnd driver has below function to check connection
	rsnd_parse_connect_simple()
	rsnd_parse_connect_graph()
But these have different parameters. This patch synchronize these
for cleanup.

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-02-01 16:46:27 +09:00
committed by Mark Brown
parent 42fea318e1
commit f497c88b19
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/sh/rcar/core.c
View File

@@ -1032,16 +1032,13 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
}; };
static void rsnd_parse_connect_simple(struct rsnd_priv *priv, static void rsnd_parse_connect_simple(struct rsnd_priv *priv,
struct device_node *dai_np, struct rsnd_dai_stream *io,
int dai_i, int is_play) struct device_node *dai_np)
{ {
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
struct rsnd_dai_stream *io = is_play ?
&rdai->playback :
&rdai->capture;
struct device_node *ssiu_np = rsnd_ssiu_of_node(priv); struct device_node *ssiu_np = rsnd_ssiu_of_node(priv);
struct device_node *np; struct device_node *np;
int is_play = rsnd_io_is_play(io);
int i, j; int i, j;
if (!ssiu_np) if (!ssiu_np)
@@ -1292,8 +1289,10 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
for_each_child_of_node(dai_node, dai_np) { for_each_child_of_node(dai_node, dai_np) {
__rsnd_dai_probe(priv, dai_np, dai_i); __rsnd_dai_probe(priv, dai_np, dai_i);
if (rsnd_is_gen3(priv)) { if (rsnd_is_gen3(priv)) {
rsnd_parse_connect_simple(priv, dai_np, dai_i, 1); struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
rsnd_parse_connect_simple(priv, dai_np, dai_i, 0);
rsnd_parse_connect_simple(priv, &rdai->playback, dai_np);
rsnd_parse_connect_simple(priv, &rdai->capture, dai_np);
} }
dai_i++; dai_i++;
} }