mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 17:44:14 +08:00
ASoC: rsnd: rename rsnd_path_parse/break() into add/remove
parse/break is a little ambiguous/confusable name for rsnd module path. Especially for CTU/MIX support. It was renamed to add/remove Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d6f8d5b442
commit
c8cf15f64f
@ -507,7 +507,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
|
|||||||
.set_fmt = rsnd_soc_dai_set_fmt,
|
.set_fmt = rsnd_soc_dai_set_fmt,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define rsnd_path_parse(priv, io, type) \
|
#define rsnd_path_add(priv, io, type) \
|
||||||
({ \
|
({ \
|
||||||
struct rsnd_mod *mod; \
|
struct rsnd_mod *mod; \
|
||||||
int ret = 0; \
|
int ret = 0; \
|
||||||
@ -523,7 +523,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
|
|||||||
ret; \
|
ret; \
|
||||||
})
|
})
|
||||||
|
|
||||||
#define rsnd_path_break(priv, io, type) \
|
#define rsnd_path_remove(priv, io, type) \
|
||||||
{ \
|
{ \
|
||||||
struct rsnd_mod *mod; \
|
struct rsnd_mod *mod; \
|
||||||
int id = -1; \
|
int id = -1; \
|
||||||
@ -555,17 +555,17 @@ static int rsnd_path_init(struct rsnd_priv *priv,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* SRC */
|
/* SRC */
|
||||||
ret = rsnd_path_parse(priv, io, src);
|
ret = rsnd_path_add(priv, io, src);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* SSI */
|
/* SSI */
|
||||||
ret = rsnd_path_parse(priv, io, ssi);
|
ret = rsnd_path_add(priv, io, ssi);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* DVC */
|
/* DVC */
|
||||||
ret = rsnd_path_parse(priv, io, dvc);
|
ret = rsnd_path_add(priv, io, dvc);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -1023,8 +1023,8 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
|
|||||||
/*
|
/*
|
||||||
* remove SRC/DVC from DAI,
|
* remove SRC/DVC from DAI,
|
||||||
*/
|
*/
|
||||||
rsnd_path_break(priv, io, src);
|
rsnd_path_remove(priv, io, src);
|
||||||
rsnd_path_break(priv, io, dvc);
|
rsnd_path_remove(priv, io, dvc);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* fallback
|
* fallback
|
||||||
|
Loading…
Reference in New Issue
Block a user