Unverified Commit a3f6bf8e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: sh: remove discriminatory terms" from Kuninori Morimoto... 

Merge series "ASoC: sh: remove discriminatory terms" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Renesas SH drivers are using discriminatory terms.
This patch-set removes or changes it as much as possible.
But, because DMA related API function name, it still exists.
I hope all these are removed someday.

v1 -> v2
	- use "secondary" instead of "follower"
	- care siu/ssi drivers
	- tidyup git-log

Link: https://lore.kernel.org/r/87r1tg3swv.wl-kuninori.morimoto.gx@renesas.com

Kuninori Morimoto (5):
  ASoC: rsnd: don't use discriminatory terms for function names
  ASoC: rsnd: don't use discriminatory terms for comment
  ASoC: fsi: don't use discriminatory terms for comment
  ASoC: siu: don't use discriminatory terms for parameter
  ASoC: ssi: don't use discriminatory terms for debug log

 sound/soc/sh/fsi.c       |  4 ++--
 sound/soc/sh/rcar/core.c |  4 ++--
 sound/soc/sh/rcar/rsnd.h |  2 +-
 sound/soc/sh/rcar/ssi.c  | 28 ++++++++++++++--------------
 sound/soc/sh/rcar/ssiu.c |  6 +++---
 sound/soc/sh/siu_pcm.c   |  6 +++---
 sound/soc/sh/ssi.c       |  2 +-
 7 files changed, 26 insertions(+), 26 deletions(-)

--
2.25.1
parents 3d04d1cc 0498b5bf

sound/soc/sh/fsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1632,12 +1632,12 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai);

	int ret;



	/* set master/slave audio interface */

	/* set clock master audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		fsi->clk_master = 1; /* codec is slave, cpu is master */

		fsi->clk_master = 1; /* cpu is master */

		break;

	default:

		return -EINVAL;

sound/soc/sh/rcar/core.c

+2 −2
Original line number Diff line number Diff line
@@ -759,13 +759,13 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
{

	struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);



	/* set master/slave audio interface */

	/* set clock master for audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

		rdai->clk_master = 0;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		rdai->clk_master = 1; /* codec is slave, cpu is master */

		rdai->clk_master = 1; /* cpu is master */

		break;

	default:

		return -EINVAL;

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv); 
void rsnd_ssi_remove(struct rsnd_priv *priv);

struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);

int rsnd_ssi_use_busif(struct rsnd_dai_stream *io);

u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io);

u32 rsnd_ssi_multi_secondaries_runtime(struct rsnd_dai_stream *io);



#define rsnd_ssi_is_pin_sharing(io)	\

	__rsnd_ssi_is_pin_sharing(rsnd_io_to_mod_ssi(io))

sound/soc/sh/rcar/ssi.c

+14 −14
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ struct rsnd_ssi { 
#define rsnd_ssi_nr(priv) ((priv)->ssi_nr)

#define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod)

#define rsnd_ssi_is_parent(ssi, io) ((ssi) == rsnd_io_to_mod_ssip(io))

#define rsnd_ssi_is_multi_slave(mod, io) \

	(rsnd_ssi_multi_slaves(io) & (1 << rsnd_mod_id(mod)))

#define rsnd_ssi_is_multi_secondary(mod, io)				\

	(rsnd_ssi_multi_secondaries(io) & (1 << rsnd_mod_id(mod)))

#define rsnd_ssi_is_run_mods(mod, io) \

	(rsnd_ssi_run_mods(io) & (1 << rsnd_mod_id(mod)))

#define rsnd_ssi_can_output_clk(mod) (!__rsnd_ssi_is_pin_sharing(mod))
@@ -165,7 +165,7 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod, 
	dev_warn(dev, "%s status check failed\n", rsnd_mod_name(mod));

}



static u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io)

static u32 rsnd_ssi_multi_secondaries(struct rsnd_dai_stream *io)

{

	struct rsnd_mod *mod;

	enum rsnd_mod_type types[] = {
@@ -193,7 +193,7 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io) 
	struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);

	u32 mods;



	mods = rsnd_ssi_multi_slaves_runtime(io) |

	mods = rsnd_ssi_multi_secondaries_runtime(io) |

		1 << rsnd_mod_id(ssi_mod);



	if (ssi_parent_mod)
@@ -202,10 +202,10 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io) 
	return mods;

}



u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io)

u32 rsnd_ssi_multi_secondaries_runtime(struct rsnd_dai_stream *io)

{

	if (rsnd_runtime_is_multi_ssi(io))

		return rsnd_ssi_multi_slaves(io);

		return rsnd_ssi_multi_secondaries(io);



	return 0;

}
@@ -283,7 +283,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, 
	if (!rsnd_ssi_can_output_clk(mod))

		return 0;



	if (rsnd_ssi_is_multi_slave(mod, io))

	if (rsnd_ssi_is_multi_secondary(mod, io))

		return 0;



	if (rsnd_runtime_is_tdm_split(io))
@@ -626,7 +626,7 @@ static int rsnd_ssi_start(struct rsnd_mod *mod, 
	 * EN will be set via SSIU :: SSI_CONTROL

	 * if Multi channel mode

	 */

	if (rsnd_ssi_multi_slaves_runtime(io))

	if (rsnd_ssi_multi_secondaries_runtime(io))

		return 0;



	/*
@@ -675,7 +675,7 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, 
	/* In multi-SSI mode, stop is performed by setting ssi0129 in

	 * SSI_CONTROL to 0 (in rsnd_ssio_stop_gen2). Do nothing here.

	 */

	if (rsnd_ssi_multi_slaves_runtime(io))

	if (rsnd_ssi_multi_secondaries_runtime(io))

		return 0;



	/*
@@ -888,7 +888,7 @@ static void rsnd_ssi_parent_attach(struct rsnd_mod *mod, 
	if (!rsnd_rdai_is_clk_master(rdai))

		return;



	if (rsnd_ssi_is_multi_slave(mod, io))

	if (rsnd_ssi_is_multi_secondary(mod, io))

		return;



	switch (rsnd_mod_id(mod)) {
@@ -930,9 +930,9 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod, 


	/*

	 * SSIP/SSIU/IRQ are not needed on

	 * SSI Multi slaves

	 * SSI Multi secondaries

	 */

	if (rsnd_ssi_is_multi_slave(mod, io))

	if (rsnd_ssi_is_multi_secondary(mod, io))

		return 0;



	/*
@@ -1091,9 +1091,9 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, 


	/*

	 * SSIP/SSIU/IRQ/DMA are not needed on

	 * SSI Multi slaves

	 * SSI Multi secondaries

	 */

	if (rsnd_ssi_is_multi_slave(mod, io))

	if (rsnd_ssi_is_multi_secondary(mod, io))

		return 0;



	ret = rsnd_ssi_common_probe(mod, io, priv);

sound/soc/sh/rcar/ssiu.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, 
			  struct rsnd_priv *priv)

{

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	u32 ssis = rsnd_ssi_multi_slaves_runtime(io);

	u32 ssis = rsnd_ssi_multi_secondaries_runtime(io);

	int use_busif = rsnd_ssi_use_busif(io);

	int id = rsnd_mod_id(mod);

	int is_clk_master = rsnd_rdai_is_clk_master(rdai);
@@ -246,7 +246,7 @@ static int rsnd_ssiu_start_gen2(struct rsnd_mod *mod, 


	rsnd_mod_bset(mod, SSI_CTRL, 1 << (busif * 4), 1 << (busif * 4));



	if (rsnd_ssi_multi_slaves_runtime(io))

	if (rsnd_ssi_multi_secondaries_runtime(io))

		rsnd_mod_write(mod, SSI_CONTROL, 0x1);



	return 0;
@@ -267,7 +267,7 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod, 
	if (--ssiu->usrcnt)

		return 0;



	if (rsnd_ssi_multi_slaves_runtime(io))

	if (rsnd_ssi_multi_secondaries_runtime(io))

		rsnd_mod_write(mod, SSI_CONTROL, 0);



	return 0;