diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-01-15 03:05:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-15 06:37:48 -0500 |
commit | 7c57d76f5181d50ae04adf92180c5d53dd3c9756 (patch) | |
tree | 11507af02a0b381dca91b5b3f0345ce072fc269f | |
parent | 2842aa719252bbec99869b03dfc42c52a307877a (diff) |
ASoC: rsnd: remove rsnd_dai_get_platform_info() macro
rsnd_dai_get_platform_info() is not used. Let's remove it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/sh/rcar/core.c | 5 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 487ddf78b8ee..852fa0410afd 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -865,10 +865,9 @@ static int rsnd_dai_probe(struct platform_device *pdev, | |||
865 | priv->rdai = rdai; | 865 | priv->rdai = rdai; |
866 | 866 | ||
867 | for (i = 0; i < dai_nr; i++) { | 867 | for (i = 0; i < dai_nr; i++) { |
868 | rdai[i].info = &info->dai_info[i]; | ||
869 | 868 | ||
870 | pmod = rdai[i].info->playback.ssi; | 869 | pmod = info->dai_info[i].playback.ssi; |
871 | cmod = rdai[i].info->capture.ssi; | 870 | cmod = info->dai_info[i].capture.ssi; |
872 | 871 | ||
873 | /* | 872 | /* |
874 | * init rsnd_dai | 873 | * init rsnd_dai |
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 28a06fce794e..ad76870dba13 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -295,7 +295,6 @@ struct rsnd_dai_stream { | |||
295 | 295 | ||
296 | struct rsnd_dai { | 296 | struct rsnd_dai { |
297 | char name[RSND_DAI_NAME_SIZE]; | 297 | char name[RSND_DAI_NAME_SIZE]; |
298 | struct rsnd_dai_platform_info *info; /* rcar_snd.h */ | ||
299 | struct rsnd_dai_stream playback; | 298 | struct rsnd_dai_stream playback; |
300 | struct rsnd_dai_stream capture; | 299 | struct rsnd_dai_stream capture; |
301 | 300 | ||
@@ -317,7 +316,6 @@ struct rsnd_dai { | |||
317 | struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id); | 316 | struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id); |
318 | 317 | ||
319 | int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io); | 318 | int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io); |
320 | #define rsnd_dai_get_platform_info(rdai) ((rdai)->info) | ||
321 | 319 | ||
322 | void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt); | 320 | void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt); |
323 | int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional); | 321 | int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional); |