Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 710d0889 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 85642952

sound/soc/sh/rcar/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

sound/soc/sh/rcar/rsnd.h

+3 −2
Original line number Diff line number Diff line
@@ -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)