| From 71f1f9e46eaa394c736493fd43fe6dd90b2b004a Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 24 Feb 2014 22:14:41 -0800 |
| Subject: ASoC: rsnd: move rsnd_mod_call() macro |
| |
| core.c is the only user of rsnd_mod_call() macro. |
| Move it to core.c from rsnd.h |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit d870a91e9d0eae524ac2da7cbdc7e399a71b86c4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 34 ++++++++++++++++++++++++---------- |
| sound/soc/sh/rcar/rsnd.h | 13 ------------- |
| 2 files changed, 24 insertions(+), 23 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index a8e6aa6cb334..5f6d9fef23d1 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -291,16 +291,30 @@ void rsnd_dma_quit(struct rsnd_priv *priv, |
| /* |
| * rsnd_dai functions |
| */ |
| -#define rsnd_dai_call(rdai, io, fn) \ |
| -({ \ |
| - struct rsnd_mod *mod, *n; \ |
| - int ret = 0; \ |
| - for_each_rsnd_mod(mod, n, io) { \ |
| - ret = rsnd_mod_call(mod, fn, rdai, io); \ |
| - if (ret < 0) \ |
| - break; \ |
| - } \ |
| - ret; \ |
| +#define __rsnd_mod_call(mod, func, rdai, io) \ |
| +({ \ |
| + struct rsnd_priv *priv = rsnd_mod_to_priv(mod); \ |
| + struct device *dev = rsnd_priv_to_dev(priv); \ |
| + dev_dbg(dev, "%s [%d] %s\n", \ |
| + rsnd_mod_name(mod), rsnd_mod_id(mod), #func); \ |
| + (mod)->ops->func(mod, rdai, io); \ |
| +}) |
| + |
| +#define rsnd_mod_call(mod, func, rdai, io) \ |
| + (!(mod) ? -ENODEV : \ |
| + !((mod)->ops->func) ? 0 : \ |
| + __rsnd_mod_call(mod, func, (rdai), (io))) |
| + |
| +#define rsnd_dai_call(rdai, io, fn) \ |
| +({ \ |
| + struct rsnd_mod *mod, *n; \ |
| + int ret = 0; \ |
| + for_each_rsnd_mod(mod, n, (io)) { \ |
| + ret = rsnd_mod_call(mod, fn, (rdai), (io)); \ |
| + if (ret < 0) \ |
| + break; \ |
| + } \ |
| + ret; \ |
| }) |
| |
| int rsnd_dai_connect(struct rsnd_dai *rdai, |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index d4093907dfd8..fb1e0cee08b6 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -169,19 +169,6 @@ struct rsnd_mod { |
| #define rsnd_mod_id(mod) ((mod)->id) |
| #define for_each_rsnd_mod(pos, n, io) \ |
| list_for_each_entry_safe(pos, n, &(io)->head, list) |
| -#define __rsnd_mod_call(mod, func, rdai, io) \ |
| -({ \ |
| - struct rsnd_priv *priv = rsnd_mod_to_priv(mod); \ |
| - struct device *dev = rsnd_priv_to_dev(priv); \ |
| - dev_dbg(dev, "%s-%d-%s\n", \ |
| - rsnd_mod_name(mod), rsnd_mod_id(mod), #func); \ |
| - (mod)->ops->func(mod, rdai, io); \ |
| -}) |
| - |
| -#define rsnd_mod_call(mod, func, rdai, io) \ |
| - (!(mod) ? -ENODEV : \ |
| - !((mod)->ops->func) ? 0 : \ |
| - __rsnd_mod_call(mod, func, rdai, io)) |
| |
| void rsnd_mod_init(struct rsnd_priv *priv, |
| struct rsnd_mod *mod, |
| -- |
| 2.1.2 |
| |