iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rsnd: rename rsnd_dai_get() to rsnd_rdai_get()

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto 2015-01-15 08:03:38 +00:00 committed by Mark Brown
parent 8564295231
commit 710d088923
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sh/rcar/core.c
View File

@ -489,7 +489,7 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
return id; return id;
} }
struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id) struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id)
{ {
if ((id < 0) || (id >= rsnd_rdai_nr(priv))) if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
return NULL; return NULL;
@ -501,7 +501,7 @@ static struct rsnd_dai *rsnd_dai_to_rdai(struct snd_soc_dai *dai)
{ {
struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai); struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai);
return rsnd_dai_get(priv, dai->id); return rsnd_rdai_get(priv, dai->id);
} }
int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io) int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io)

5
sound/soc/sh/rcar/rsnd.h
View File

@ -310,10 +310,11 @@ struct rsnd_dai {
#define for_each_rsnd_dai(rdai, priv, i) \ #define for_each_rsnd_dai(rdai, priv, i) \
for (i = 0; \ for (i = 0; \
(i < rsnd_rdai_nr(priv)) && \ (i < rsnd_rdai_nr(priv)) && \
((rdai) = rsnd_dai_get(priv, i)); \ ((rdai) = rsnd_rdai_get(priv, i)); \
i++) i++)
struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id); 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); int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io);
int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai); int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai);
#define rsnd_dai_get_platform_info(rdai) ((rdai)->info) #define rsnd_dai_get_platform_info(rdai) ((rdai)->info)