[07/16] ASoC: rsnd: remove rsnd_dai_get_platform_info() macro

Commit Message

Kuninori Morimoto Jan. 15, 2015, 8:05 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

rsnd_dai_get_platform_info() is not used. Let's remove it.

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 sound/soc/sh/rcar/core.c |    5 ++---
 sound/soc/sh/rcar/rsnd.h |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 487ddf7..852fa04 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,
 	priv->rdai	= rdai;
 
 	for (i = 0; i < dai_nr; i++) {
-		rdai[i].info = &info->dai_info[i];
 
-		pmod = rdai[i].info->playback.ssi;
-		cmod = rdai[i].info->capture.ssi;
+		pmod = info->dai_info[i].playback.ssi;
+		cmod = info->dai_info[i].capture.ssi;
 
 		/*
 		 *	init rsnd_dai
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 28a06fc..ad76870 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -295,7 +295,6 @@  struct rsnd_dai_stream {
 
 struct rsnd_dai {
 	char name[RSND_DAI_NAME_SIZE];
-	struct rsnd_dai_platform_info *info; /* rcar_snd.h */
 	struct rsnd_dai_stream playback;
 	struct rsnd_dai_stream capture;
 
@@ -317,7 +316,6 @@  struct rsnd_dai {
 struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id);
 
 int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io);
-#define rsnd_dai_get_platform_info(rdai) ((rdai)->info)
 
 void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt);
 int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);