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

ASoC: rsnd: rename rsnd_runtime_is_ssi_xxx() 



Current rsnd driver has rsnd_runtime_is_ssi_xxx() functions,
but it is not only related to SSI, thus, it is misunderstandable.
This patch renames it.

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

sound/soc/sh/rcar/core.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io, 
		rsnd_runtime_channel_original_with_params(io, params);



	/* Use Multi SSI */

	if (rsnd_runtime_is_ssi_multi(io))

	if (rsnd_runtime_is_multi_ssi(io))

		chan /= rsnd_rdai_ssi_lane_get(rdai);



	/* TDM Extend Mode needs 8ch */
@@ -297,7 +297,7 @@ int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io, 
	return chan;

}



int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io)

int rsnd_runtime_is_multi_ssi(struct rsnd_dai_stream *io)

{

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	int lane = rsnd_rdai_ssi_lane_get(rdai);
@@ -308,7 +308,7 @@ int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io) 
	return (chan > 2) && (lane > 1);

}



int rsnd_runtime_is_ssi_tdm(struct rsnd_dai_stream *io)

int rsnd_runtime_is_tdm(struct rsnd_dai_stream *io)

{

	return rsnd_runtime_channel_for_ssi(io) >= 6;

}

sound/soc/sh/rcar/rsnd.h

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ int rsnd_runtime_channel_after_ctu_with_params(struct rsnd_dai_stream *io, 
	rsnd_runtime_channel_for_ssi_with_params(io, NULL)

int rsnd_runtime_channel_for_ssi_with_params(struct rsnd_dai_stream *io,

				 struct snd_pcm_hw_params *params);

int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io);

int rsnd_runtime_is_ssi_tdm(struct rsnd_dai_stream *io);

int rsnd_runtime_is_multi_ssi(struct rsnd_dai_stream *io);

int rsnd_runtime_is_tdm(struct rsnd_dai_stream *io);



/*

 * DT

sound/soc/sh/rcar/ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io) 


u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io)

{

	if (rsnd_runtime_is_ssi_multi(io))

	if (rsnd_runtime_is_multi_ssi(io))

		return rsnd_ssi_multi_slaves(io);



	return 0;
@@ -383,7 +383,7 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, 
	u32 wsr		= ssi->wsr;

	int is_tdm;



	is_tdm = rsnd_runtime_is_ssi_tdm(io);

	is_tdm = rsnd_runtime_is_tdm(io);



	cr_own |= FORCE | rsnd_rdai_width_to_swl(rdai);

sound/soc/sh/rcar/ssiu.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, 


	ssiu->usrcnt++;



	if (rsnd_runtime_is_ssi_tdm(io)) {

	if (rsnd_runtime_is_tdm(io)) {

		/*

		 * TDM Extend Mode

		 * see