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

Commit 3ed6448c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: rename rsnd_dai_is_clk_master() to rsnd_rdai_is_clk_master() 



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_is_clk_master() to rsnd_rdai_is_clk_master()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 710d0889

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ struct rsnd_dai { 
};



#define rsnd_rdai_nr(priv) ((priv)->rdai_nr)

#define rsnd_rdai_is_clk_master(rdai) ((rdai)->clk_master)

#define for_each_rsnd_dai(rdai, priv, i)		\

	for (i = 0;					\

	     (i < rsnd_rdai_nr(priv)) &&		\
@@ -321,7 +322,6 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai); 


void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt);

int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);

#define rsnd_dai_is_clk_master(rdai) ((rdai)->clk_master)



/*

 *	R-Car Gen1/Gen2

sound/soc/sh/rcar/src.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod, 
		if (shift >= 0)

			rsnd_mod_bset(ssi_mod, SSI_MODE1,

				      0x3 << shift,

				      rsnd_dai_is_clk_master(rdai) ?

				      rsnd_rdai_is_clk_master(rdai) ?

				      0x2 << shift : 0x1 << shift);

	}

sound/soc/sh/rcar/ssi.c

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi, 
	if (0 == ssi->usrcnt) {

		rsnd_mod_hw_start(&ssi->mod);



		if (rsnd_dai_is_clk_master(rdai)) {

		if (rsnd_rdai_is_clk_master(rdai)) {

			if (rsnd_ssi_clk_from_parent(ssi))

				rsnd_ssi_hw_start(ssi->parent, rdai, io);

			else
@@ -210,7 +210,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi, 
	rsnd_mod_write(&ssi->mod, SSICR, cr);



	/* enable WS continue */

	if (rsnd_dai_is_clk_master(rdai))

	if (rsnd_rdai_is_clk_master(rdai))

		rsnd_mod_write(&ssi->mod, SSIWSR, CONT);



	/* clear error status */
@@ -252,7 +252,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi, 
		rsnd_mod_write(&ssi->mod, SSICR, cr);	/* disabled all */

		rsnd_ssi_status_check(&ssi->mod, IIRQ);



		if (rsnd_dai_is_clk_master(rdai)) {

		if (rsnd_rdai_is_clk_master(rdai)) {

			if (rsnd_ssi_clk_from_parent(ssi))

				rsnd_ssi_hw_stop(ssi->parent, rdai);

			else