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

ASoC: rsnd: move rsnd_mod_call() macro

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto 2014-02-24 22:14:41 -08:00 committed by Mark Brown
parent 498480731e
commit d870a91e9d
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,16 +291,30 @@ void rsnd_dma_quit(struct rsnd_priv *priv,
/* /*
* rsnd_dai functions * rsnd_dai functions
*/ */
#define rsnd_dai_call(rdai, io, fn) \ #define __rsnd_mod_call(mod, func, rdai, io) \
({ \ ({ \
struct rsnd_mod *mod, *n; \ struct rsnd_priv *priv = rsnd_mod_to_priv(mod); \
int ret = 0; \ struct device *dev = rsnd_priv_to_dev(priv); \
for_each_rsnd_mod(mod, n, io) { \ dev_dbg(dev, "%s [%d] %s\n", \
ret = rsnd_mod_call(mod, fn, rdai, io); \ rsnd_mod_name(mod), rsnd_mod_id(mod), #func); \
if (ret < 0) \ (mod)->ops->func(mod, rdai, io); \
break; \ })
} \
ret; \ #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, int rsnd_dai_connect(struct rsnd_dai *rdai,

13
sound/soc/sh/rcar/rsnd.h
View File

@ -169,19 +169,6 @@ struct rsnd_mod {
#define rsnd_mod_id(mod) ((mod)->id) #define rsnd_mod_id(mod) ((mod)->id)
#define for_each_rsnd_mod(pos, n, io) \ #define for_each_rsnd_mod(pos, n, io) \
list_for_each_entry_safe(pos, n, &(io)->head, list) 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, void rsnd_mod_init(struct rsnd_priv *priv,
struct rsnd_mod *mod, struct rsnd_mod *mod,