diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-01-15 03:06:24 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-15 06:37:48 -0500 |
commit | 54cb556247b171753484efb3c4777ca4d1babfa0 (patch) | |
tree | 4a2e2c8e63b7212a5ca5446c9976fa41105cef1b /sound | |
parent | 7c57d76f5181d50ae04adf92180c5d53dd3c9756 (diff) |
ASoC: rsnd: add rsnd_io_to_rdai()
Current rsnd driver request rdai in everywhere, but each mod should
reach to rdai by itself. this patch adds missing rsnd_io_to_rdai().
io = rsnd_mod_to_io(mod);
rdai = rsnd_io_to_rdai(io);
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/rcar/core.c | 2 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 852fa0410afd..c8111857c9d9 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -886,6 +886,7 @@ static int rsnd_dai_probe(struct platform_device *pdev, | |||
886 | drv[i].playback.channels_max = 2; | 886 | drv[i].playback.channels_max = 2; |
887 | 887 | ||
888 | rdai[i].playback.info = &info->dai_info[i].playback; | 888 | rdai[i].playback.info = &info->dai_info[i].playback; |
889 | rdai[i].playback.rdai = rdai + i; | ||
889 | rsnd_path_init(priv, &rdai[i], &rdai[i].playback); | 890 | rsnd_path_init(priv, &rdai[i], &rdai[i].playback); |
890 | } | 891 | } |
891 | if (cmod) { | 892 | if (cmod) { |
@@ -895,6 +896,7 @@ static int rsnd_dai_probe(struct platform_device *pdev, | |||
895 | drv[i].capture.channels_max = 2; | 896 | drv[i].capture.channels_max = 2; |
896 | 897 | ||
897 | rdai[i].capture.info = &info->dai_info[i].capture; | 898 | rdai[i].capture.info = &info->dai_info[i].capture; |
899 | rdai[i].capture.rdai = rdai + i; | ||
898 | rsnd_path_init(priv, &rdai[i], &rdai[i].capture); | 900 | rsnd_path_init(priv, &rdai[i], &rdai[i].capture); |
899 | } | 901 | } |
900 | 902 | ||
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index ad76870dba13..0b5518259c28 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -282,6 +282,7 @@ struct rsnd_dai_stream { | |||
282 | struct snd_pcm_substream *substream; | 282 | struct snd_pcm_substream *substream; |
283 | struct rsnd_mod *mod[RSND_MOD_MAX]; | 283 | struct rsnd_mod *mod[RSND_MOD_MAX]; |
284 | struct rsnd_dai_path_info *info; /* rcar_snd.h */ | 284 | struct rsnd_dai_path_info *info; /* rcar_snd.h */ |
285 | struct rsnd_dai *rdai; | ||
285 | int byte_pos; | 286 | int byte_pos; |
286 | int period_pos; | 287 | int period_pos; |
287 | int byte_per_period; | 288 | int byte_per_period; |
@@ -290,6 +291,7 @@ struct rsnd_dai_stream { | |||
290 | #define rsnd_io_to_mod_ssi(io) ((io)->mod[RSND_MOD_SSI]) | 291 | #define rsnd_io_to_mod_ssi(io) ((io)->mod[RSND_MOD_SSI]) |
291 | #define rsnd_io_to_mod_src(io) ((io)->mod[RSND_MOD_SRC]) | 292 | #define rsnd_io_to_mod_src(io) ((io)->mod[RSND_MOD_SRC]) |
292 | #define rsnd_io_to_mod_dvc(io) ((io)->mod[RSND_MOD_DVC]) | 293 | #define rsnd_io_to_mod_dvc(io) ((io)->mod[RSND_MOD_DVC]) |
294 | #define rsnd_io_to_rdai(io) ((io)->rdai) | ||
293 | #define rsnd_io_to_runtime(io) ((io)->substream ? \ | 295 | #define rsnd_io_to_runtime(io) ((io)->substream ? \ |
294 | (io)->substream->runtime : NULL) | 296 | (io)->substream->runtime : NULL) |
295 | 297 | ||