redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: rsnd: unify rdai naming

Browse source 
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>
This commit is contained in:
Kuninori Morimoto 2014-02-24 22:15:18 -08:00 committed by Mark Brown
parent 98455ed5dd
commit ecba9e724c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/sh/rcar/core.c
View file

@ -352,7 +352,7 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
{
int id = rdai - priv->rdai;
if ((id < 0) || (id >= rsnd_dai_nr(priv)))
if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
return -EINVAL;
return id;
@ -360,7 +360,7 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id)
{
if ((id < 0) || (id >= rsnd_dai_nr(priv)))
if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
return NULL;
return priv->rdai + id;
@ -607,7 +607,7 @@ static int rsnd_dai_probe(struct platform_device *pdev,
return -ENOMEM;
}
priv->dai_nr = dai_nr;
priv->rdai_nr = dai_nr;
priv->daidrv = drv;
priv->rdai = rdai;
@ -802,7 +802,7 @@ static int rsnd_probe(struct platform_device *pdev)
}
ret = snd_soc_register_component(dev, &rsnd_soc_component,
priv->daidrv, rsnd_dai_nr(priv));
priv->daidrv, rsnd_rdai_nr(priv));
if (ret < 0) {
dev_err(dev, "cannot snd dai register\n");
goto exit_snd_soc;

6
sound/soc/sh/rcar/rsnd.h
View file

@ -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)