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

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

ASoC: rsnd: tidyup rsnd_get_slot_xxx() naming 



rsnd_get_slot_rdai() returns total slots (it returns 6 if total 6
channels) , and rsnd_get_slot_extend() returns extended SSI width
(it returns 8 if total 6 channels). This will be used on SSI multi
channel support too (It will return 2 if total 6 channels with 3 SSI).
But, it is using confusable naming.
This patch changes rsnd_get_slot_rdai() -> rsnd_get_slot(),
rsnd_get_slot_extend() -> rsnd_get_slot_width()

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

sound/soc/sh/rcar/core.c

+4 −2
Original line number Diff line number Diff line
@@ -191,12 +191,14 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io) 
	return !!io->substream;

}



int rsnd_get_slot_rdai(struct rsnd_dai *rdai)

int rsnd_get_slot(struct rsnd_dai_stream *io)

{

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);



	return rdai->slots;

}



int rsnd_get_slot_extend(struct rsnd_dai_stream *io)

int rsnd_get_slot_width(struct rsnd_dai_stream *io)

{

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	int chan = runtime->channels;

sound/soc/sh/rcar/dvc.c

+1 −2
Original line number Diff line number Diff line
@@ -242,10 +242,9 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod, 
			    struct rsnd_dai_stream *io,

			    struct snd_soc_pcm_runtime *rtd)

{

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);

	int is_play = rsnd_io_is_play(io);

	int slots = rsnd_get_slot_rdai(rdai);

	int slots = rsnd_get_slot(io);

	int ret;



	/* Volume */

sound/soc/sh/rcar/rsnd.h

+2 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod, 
			void (*callback)(struct rsnd_mod *mod,

					 struct rsnd_dai_stream *io));



int rsnd_get_slot_rdai(struct rsnd_dai *rdai);

int rsnd_get_slot_extend(struct rsnd_dai_stream *io);

int rsnd_get_slot(struct rsnd_dai_stream *io);

int rsnd_get_slot_width(struct rsnd_dai_stream *io);



/*

 *	R-Car sound DAI

sound/soc/sh/rcar/ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, 
	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct rsnd_mod *mod = rsnd_mod_get(ssi);

	struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);

	int slots = rsnd_get_slot_extend(io);

	int slots = rsnd_get_slot_width(io);

	int j, ret;

	int ssi_clk_mul_table[] = {

		1, 2, 4, 8, 16, 6, 12,
@@ -267,7 +267,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, 
	u32 wsr;

	int is_tdm;



	is_tdm = (rsnd_get_slot_extend(io) >= 6) ? 1 : 0;

	is_tdm = (rsnd_get_slot_width(io) >= 6) ? 1 : 0;



	/*

	 * always use 32bit system word.

sound/soc/sh/rcar/ssiu.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, 
	if (ret < 0)

		return ret;



	if (rsnd_get_slot_extend(io) >= 6) {

	if (rsnd_get_slot_width(io) >= 6) {

		/*

		 * TDM Extend Mode

		 * see