Skip to content

Commit ede6445

Browse files
morimotobroonie
authored andcommitted
ASoC: soc-pcm: tidyup function name to snd_soc_dpcm_be_can_xxx()
We have similar but different function names snd_soc_dpcm_fe_can_xxx() snd_soc_dpcm_be_can_xxx() snd_soc_dpcm_can_be_xxx() ~~~~~~ Let's unified these to can_xx Signed-off-by: Kuninori Morimoto <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 02026aa commit ede6445

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

sound/soc/soc-pcm.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd,
3636

3737
/* is the current PCM operation for this FE ? */
3838
#if 0
39-
static int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream)
39+
static int snd_soc_dpcm_can_fe_update(struct snd_soc_pcm_runtime *fe, int stream)
4040
{
4141
if (fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE)
4242
return 1;
@@ -45,7 +45,7 @@ static int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream
4545
#endif
4646

4747
/* is the current PCM operation for this BE ? */
48-
static int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe,
48+
static int snd_soc_dpcm_can_be_update(struct snd_soc_pcm_runtime *fe,
4949
struct snd_soc_pcm_runtime *be, int stream)
5050
{
5151
if ((fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE) ||
@@ -1632,7 +1632,7 @@ void dpcm_be_dai_stop(struct snd_soc_pcm_runtime *fe, int stream,
16321632
return;
16331633

16341634
/* is this op for this BE ? */
1635-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
1635+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
16361636
continue;
16371637

16381638
if (be->dpcm[stream].users == 0) {
@@ -1682,7 +1682,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
16821682
}
16831683

16841684
/* is this op for this BE ? */
1685-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
1685+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
16861686
continue;
16871687

16881688
/* first time the dpcm is open ? */
@@ -2007,7 +2007,7 @@ void dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream)
20072007
snd_soc_dpcm_get_substream(be, stream);
20082008

20092009
/* is this op for this BE ? */
2010-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2010+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
20112011
continue;
20122012

20132013
/* only free hw when no longer used - check all FEs */
@@ -2073,7 +2073,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream)
20732073
be_substream = snd_soc_dpcm_get_substream(be, stream);
20742074

20752075
/* is this op for this BE ? */
2076-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2076+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
20772077
continue;
20782078

20792079
/* copy params for each dpcm */
@@ -2118,7 +2118,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream)
21182118
be = dpcm->be;
21192119
be_substream = snd_soc_dpcm_get_substream(be, stream);
21202120

2121-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2121+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
21222122
continue;
21232123

21242124
/* only allow hw_free() if no connected FEs are running */
@@ -2188,7 +2188,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
21882188
snd_pcm_stream_lock_irqsave_nested(be_substream, flags);
21892189

21902190
/* is this op for this BE ? */
2191-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2191+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
21922192
goto next;
21932193

21942194
dev_dbg(be->dev, "ASoC: trigger BE %s cmd %d\n",
@@ -2465,7 +2465,7 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)
24652465
snd_soc_dpcm_get_substream(be, stream);
24662466

24672467
/* is this op for this BE ? */
2468-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2468+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
24692469
continue;
24702470

24712471
if (!snd_soc_dpcm_can_be_prepared(fe, be, stream))
@@ -2623,7 +2623,7 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)
26232623
struct snd_soc_pcm_runtime *be = dpcm->be;
26242624

26252625
/* is this op for this BE ? */
2626-
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
2626+
if (!snd_soc_dpcm_can_be_update(fe, be, stream))
26272627
continue;
26282628

26292629
if (be->dpcm[stream].state == SND_SOC_DPCM_STATE_CLOSE ||

0 commit comments

Comments
 (0)