AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-24 20:14:27 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: rsnd: don't use discriminatory terms for function names

Browse Source 
rsnd is using discriminatory terms for function names.
This patch changes it to "secondary"

One note here is that it do nothing to DMA related naming
for now, because it needs framework level modification.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h7ub3qra.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-07-14 09:06:31 +09:00 committed by Mark Brown
parent f50d67f9ef
commit 25b384b8ea
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sh/rcar/rsnd.h
View File

@ -775,7 +775,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv);
void rsnd_ssi_remove(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); struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
int rsnd_ssi_use_busif(struct rsnd_dai_stream *io); 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) \ #define rsnd_ssi_is_pin_sharing(io) \
__rsnd_ssi_is_pin_sharing(rsnd_io_to_mod_ssi(io)) __rsnd_ssi_is_pin_sharing(rsnd_io_to_mod_ssi(io))

28
sound/soc/sh/rcar/ssi.c
View File

@ -111,8 +111,8 @@ struct rsnd_ssi {
#define rsnd_ssi_nr(priv) ((priv)->ssi_nr) #define rsnd_ssi_nr(priv) ((priv)->ssi_nr)
#define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod) #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_parent(ssi, io) ((ssi) == rsnd_io_to_mod_ssip(io))
#define rsnd_ssi_is_multi_slave(mod, io) \ #define rsnd_ssi_is_multi_secondary(mod, io) \
(rsnd_ssi_multi_slaves(io) & (1 << rsnd_mod_id(mod))) (rsnd_ssi_multi_secondaries(io) & (1 << rsnd_mod_id(mod)))
#define rsnd_ssi_is_run_mods(mod, io) \ #define rsnd_ssi_is_run_mods(mod, io) \
(rsnd_ssi_run_mods(io) & (1 << rsnd_mod_id(mod))) (rsnd_ssi_run_mods(io) & (1 << rsnd_mod_id(mod)))
#define rsnd_ssi_can_output_clk(mod) (!__rsnd_ssi_is_pin_sharing(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)); 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; struct rsnd_mod *mod;
enum rsnd_mod_type types[] = { 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); struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);
u32 mods; u32 mods;
mods = rsnd_ssi_multi_slaves_runtime(io) | mods = rsnd_ssi_multi_secondaries_runtime(io) |
1 << rsnd_mod_id(ssi_mod); 1 << rsnd_mod_id(ssi_mod);
if (ssi_parent_mod) if (ssi_parent_mod)
@ -202,10 +202,10 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io)
return mods; 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)) if (rsnd_runtime_is_multi_ssi(io))
return rsnd_ssi_multi_slaves(io); return rsnd_ssi_multi_secondaries(io);
return 0; return 0;
} }
@ -283,7 +283,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod,
if (!rsnd_ssi_can_output_clk(mod)) if (!rsnd_ssi_can_output_clk(mod))
return 0; return 0;
if (rsnd_ssi_is_multi_slave(mod, io)) if (rsnd_ssi_is_multi_secondary(mod, io))
return 0; return 0;
if (rsnd_runtime_is_tdm_split(io)) 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 * EN will be set via SSIU :: SSI_CONTROL
* if Multi channel mode * if Multi channel mode
*/ */
if (rsnd_ssi_multi_slaves_runtime(io)) if (rsnd_ssi_multi_secondaries_runtime(io))
return 0; 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 /* In multi-SSI mode, stop is performed by setting ssi0129 in
* SSI_CONTROL to 0 (in rsnd_ssio_stop_gen2). Do nothing here. * 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; return 0;
/* /*
@ -888,7 +888,7 @@ static void rsnd_ssi_parent_attach(struct rsnd_mod *mod,
if (!rsnd_rdai_is_clk_master(rdai)) if (!rsnd_rdai_is_clk_master(rdai))
return; return;
if (rsnd_ssi_is_multi_slave(mod, io)) if (rsnd_ssi_is_multi_secondary(mod, io))
return; return;
switch (rsnd_mod_id(mod)) { 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 * 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; return 0;
/* /*
@ -1091,9 +1091,9 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
/* /*
* SSIP/SSIU/IRQ/DMA are not needed on * 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; return 0;
ret = rsnd_ssi_common_probe(mod, io, priv); ret = rsnd_ssi_common_probe(mod, io, priv);

6
sound/soc/sh/rcar/ssiu.c
View File

@ -60,7 +60,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod,
struct rsnd_priv *priv) struct rsnd_priv *priv)
{ {
struct rsnd_dai *rdai = rsnd_io_to_rdai(io); 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 use_busif = rsnd_ssi_use_busif(io);
int id = rsnd_mod_id(mod); int id = rsnd_mod_id(mod);
int is_clk_master = rsnd_rdai_is_clk_master(rdai); 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)); 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); rsnd_mod_write(mod, SSI_CONTROL, 0x1);
return 0; return 0;
@ -267,7 +267,7 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod,
if (--ssiu->usrcnt) if (--ssiu->usrcnt)
return 0; return 0;
if (rsnd_ssi_multi_slaves_runtime(io)) if (rsnd_ssi_multi_secondaries_runtime(io))
rsnd_mod_write(mod, SSI_CONTROL, 0); rsnd_mod_write(mod, SSI_CONTROL, 0);
return 0; return 0;