diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-11-28 18:43:23 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-29 12:09:54 +0000 |
| commit | 994a9df1e3ea3244e94309e4f893e9a5121116c9 (patch) | |
| tree | 8fe10ee9582eca450eef3d6d2391909b78ac235d /sound | |
| parent | 42ee5d22e3d2550a49bc5d3e6f19c92da9a19446 (diff) | |
| download | blackbird-op-linux-994a9df1e3ea3244e94309e4f893e9a5121116c9.tar.gz blackbird-op-linux-994a9df1e3ea3244e94309e4f893e9a5121116c9.zip | |
ASoC: rcar: remove .path_init/exit from rsnd_gen_ops
rsnd_gen_ops has .path_init/exit callback function
which cares SRU/SSI (if Gen1) SCU/SSIU/SSI (if Gen2)
path settings.
But, the differences between Gen1/Gen2 are cared
in ssi.c/scu.c, and the path itself is same in Gen1/Gen2.
This patch removes .path_init/exit callback.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/gen.c | 54 |
1 files changed, 15 insertions, 39 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 970439d5ec0e..4f2eaa3262d7 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -16,12 +16,6 @@ struct rsnd_gen_ops { struct rsnd_priv *priv); void (*remove)(struct platform_device *pdev, struct rsnd_priv *priv); - int (*path_init)(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io); - int (*path_exit)(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io); }; struct rsnd_gen { @@ -168,17 +162,10 @@ static int rsnd_gen_regmap_init(struct rsnd_priv *priv, return 0; } -/* - * Gen2 - * will be filled in the future - */ -/* - * Gen1 - */ -static int rsnd_gen1_path_init(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io) +int rsnd_gen_path_init(struct rsnd_priv *priv, + struct rsnd_dai *rdai, + struct rsnd_dai_stream *io) { struct rsnd_mod *mod; int ret; @@ -216,9 +203,9 @@ static int rsnd_gen1_path_init(struct rsnd_priv *priv, return ret; } -static int rsnd_gen1_path_exit(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io) +int rsnd_gen_path_exit(struct rsnd_priv *priv, + struct rsnd_dai *rdai, + struct rsnd_dai_stream *io) { struct rsnd_mod *mod, *n; int ret = 0; @@ -232,6 +219,15 @@ static int rsnd_gen1_path_exit(struct rsnd_priv *priv, return ret; } +/* + * Gen2 + * will be filled in the future + */ + +/* + * Gen1 + */ + /* single address mapping */ #define RSND_GEN1_S_REG(gen, reg, id, offset) \ RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, 0, 9) @@ -319,31 +315,11 @@ static void rsnd_gen1_remove(struct platform_device *pdev, static struct rsnd_gen_ops rsnd_gen1_ops = { .probe = rsnd_gen1_probe, .remove = rsnd_gen1_remove, - .path_init = rsnd_gen1_path_init, - .path_exit = rsnd_gen1_path_exit, }; /* * Gen */ -int rsnd_gen_path_init(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io) -{ - struct rsnd_gen *gen = rsnd_priv_to_gen(priv); - - return gen->ops->path_init(priv, rdai, io); -} - -int rsnd_gen_path_exit(struct rsnd_priv *priv, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io) -{ - struct rsnd_gen *gen = rsnd_priv_to_gen(priv); - - return gen->ops->path_exit(priv, rdai, io); -} - int rsnd_gen_probe(struct platform_device *pdev, struct rcar_snd_info *info, struct rsnd_priv *priv) |
