aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-01-15 03:03:38 -0500
committerMark Brown <broonie@kernel.org>2015-01-15 06:37:48 -0500
commit710d088923856bb0e0369e675985047a51ba729c (patch)
tree3952b4b16efe529c67b49b844b0ca130ff68f01d
parent8564295231727c4a05ed2e9b8337fe70afe531ef (diff)
ASoC: rsnd: rename rsnd_dai_get() to rsnd_rdai_get()
struct rsnd_dai is called as "rdai", and struct snd_soc_dai is called as "dai" on this driver. but macro/function have confusable naming. This patch rename rsnd_dai_get() to rsnd_rdai_get() 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.c4
-rw-r--r--sound/soc/sh/rcar/rsnd.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 766bd4ce439b..b4c25d661e3d 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -489,7 +489,7 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
489 return id; 489 return id;
490} 490}
491 491
492struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id) 492struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id)
493{ 493{
494 if ((id < 0) || (id >= rsnd_rdai_nr(priv))) 494 if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
495 return NULL; 495 return NULL;
@@ -501,7 +501,7 @@ static struct rsnd_dai *rsnd_dai_to_rdai(struct snd_soc_dai *dai)
501{ 501{
502 struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai); 502 struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai);
503 503
504 return rsnd_dai_get(priv, dai->id); 504 return rsnd_rdai_get(priv, dai->id);
505} 505}
506 506
507int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io) 507int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io)
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index d8c31170b491..cd39f32acaa8 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -310,10 +310,11 @@ struct rsnd_dai {
310#define for_each_rsnd_dai(rdai, priv, i) \ 310#define for_each_rsnd_dai(rdai, priv, i) \
311 for (i = 0; \ 311 for (i = 0; \
312 (i < rsnd_rdai_nr(priv)) && \ 312 (i < rsnd_rdai_nr(priv)) && \
313 ((rdai) = rsnd_dai_get(priv, i)); \ 313 ((rdai) = rsnd_rdai_get(priv, i)); \
314 i++) 314 i++)
315 315
316struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id); 316struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id);
317
317int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io); 318int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io);
318int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai); 319int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai);
319#define rsnd_dai_get_platform_info(rdai) ((rdai)->info) 320#define rsnd_dai_get_platform_info(rdai) ((rdai)->info)