| From 3e786be716fd39acb0660d38d30609e60bd62812 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 15 Jul 2015 07:12:52 +0000 |
| Subject: [PATCH 291/326] 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> |
| (cherry picked from commit c8cf15f64f8ddb3169987c2f26df3341b8556296) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index ff4f15a2666a..93fed5031c69 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -507,7 +507,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { |
| .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; \ |
| int ret = 0; \ |
| @@ -523,7 +523,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { |
| ret; \ |
| }) |
| |
| -#define rsnd_path_break(priv, io, type) \ |
| +#define rsnd_path_remove(priv, io, type) \ |
| { \ |
| struct rsnd_mod *mod; \ |
| int id = -1; \ |
| @@ -555,17 +555,17 @@ static int rsnd_path_init(struct rsnd_priv *priv, |
| */ |
| |
| /* SRC */ |
| - ret = rsnd_path_parse(priv, io, src); |
| + ret = rsnd_path_add(priv, io, src); |
| if (ret < 0) |
| return ret; |
| |
| /* SSI */ |
| - ret = rsnd_path_parse(priv, io, ssi); |
| + ret = rsnd_path_add(priv, io, ssi); |
| if (ret < 0) |
| return ret; |
| |
| /* DVC */ |
| - ret = rsnd_path_parse(priv, io, dvc); |
| + ret = rsnd_path_add(priv, io, dvc); |
| if (ret < 0) |
| return ret; |
| |
| @@ -1023,8 +1023,8 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv, |
| /* |
| * remove SRC/DVC from DAI, |
| */ |
| - rsnd_path_break(priv, io, src); |
| - rsnd_path_break(priv, io, dvc); |
| + rsnd_path_remove(priv, io, src); |
| + rsnd_path_remove(priv, io, dvc); |
| |
| /* |
| * fallback |
| -- |
| 2.6.2 |
| |
