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>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 766bd4ce439bb3d01877230739e5a26d195ae6df..b4c25d661e3d9020f20d8357df4fff3b66871729 100644 (file)
--- 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)
        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)))
                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);
 
-       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)

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index d8c31170b491e59eb31b2b6ab9fbed9e0833f72e..cd39f32acaa897794a7b724080f413da1653b35d 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -310,10 +310,11 @@ struct rsnd_dai {
 #define for_each_rsnd_dai(rdai, priv, i)               \
        for (i = 0;                                     \
             (i < rsnd_rdai_nr(priv)) &&                \
-            ((rdai) = rsnd_dai_get(priv, i));          \
+            ((rdai) = rsnd_rdai_get(priv, 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_id(struct rsnd_priv *priv, struct rsnd_dai *rdai);
 #define rsnd_dai_get_platform_info(rdai) ((rdai)->info)