summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/rsnd.h
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-02-24 22:15:18 -0800
committerMark Brown <broonie@linaro.org>2014-03-03 10:19:21 +0900
commitecba9e724c5775aebd3a28e831643160c7146e83 (patch)
tree109c2152b58f76eaed3070b01411a922bbd31741 /sound/soc/sh/rcar/rsnd.h
parent98455ed5ddbfbcbcd0adb300c6cb1964ed0a6931 (diff)
downloadlinux-ecba9e724c5775aebd3a28e831643160c7146e83.tar.bz2
ASoC: rsnd: unify rdai naming
struct rsnd_dai is called as "rdai", but its size has been called as "dai_nr". Unify these as "rdai" Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh/rcar/rsnd.h')
-rw-r--r--sound/soc/sh/rcar/rsnd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 8ac28acc7086..3962a50977e5 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -202,10 +202,10 @@ struct rsnd_dai {
unsigned int data_alignment:1;
};
-#define rsnd_dai_nr(priv) ((priv)->dai_nr)
+#define rsnd_rdai_nr(priv) ((priv)->rdai_nr)
#define for_each_rsnd_dai(rdai, priv, i) \
for (i = 0; \
- (i < rsnd_dai_nr(priv)) && \
+ (i < rsnd_rdai_nr(priv)) && \
((rdai) = rsnd_dai_get(priv, i)); \
i++)
@@ -299,7 +299,7 @@ struct rsnd_priv {
*/
struct snd_soc_dai_driver *daidrv;
struct rsnd_dai *rdai;
- int dai_nr;
+ int rdai_nr;
};
#define rsnd_priv_to_dev(priv) ((priv)->dev)