mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ASoC: soc-pcm: add dpcm_runtime_setup()
dpcm_fe_dai_startup() (= A) calls dpcm_set_fe_runtime() (= B) to setup DPCM runtime. From *naming point of view*, it sounds like setup function for FE. (A) static int dpcm_fe_dai_startup(...) { ... (B) dpcm_set_fe_runtime(...); ... } But in dpcm_set_fe_runtime() (= B), It setups FE by dpcm_runtime_setup_fe() (= X), and setups BE by dpcm_runtime_merge_xxx() (= Y). (B) static void dpcm_set_fe_runtime(...) { ... (X) dpcm_runtime_setup_fe(...); ^ dpcm_runtime_merge_format(...); (Y) dpcm_runtime_merge_chan(...); v dpcm_runtime_merge_rate(...); } These means that the function which is called as xxx_fe_xxx() is setups both FE and BE. This is confusable and can be hot bed for bug. This patch renames unclear dpcm_runtime_merge_xxx() (= Y) to more clear dpcm_runtime_setup_be_xxx(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87o8gdvsgr.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
5f53898af1
commit
1b8cb123f3
1 changed files with 9 additions and 11 deletions
|
@ -1556,10 +1556,10 @@ static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,
|
static void dpcm_runtime_setup_be_format(struct snd_pcm_substream *substream)
|
||||||
struct snd_pcm_runtime *runtime)
|
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
||||||
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_pcm_hardware *hw = &runtime->hw;
|
struct snd_pcm_hardware *hw = &runtime->hw;
|
||||||
struct snd_soc_dpcm *dpcm;
|
struct snd_soc_dpcm *dpcm;
|
||||||
struct snd_soc_dai *dai;
|
struct snd_soc_dai *dai;
|
||||||
|
@ -1593,10 +1593,10 @@ static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dpcm_runtime_merge_chan(struct snd_pcm_substream *substream,
|
static void dpcm_runtime_setup_be_chan(struct snd_pcm_substream *substream)
|
||||||
struct snd_pcm_runtime *runtime)
|
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
||||||
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_pcm_hardware *hw = &runtime->hw;
|
struct snd_pcm_hardware *hw = &runtime->hw;
|
||||||
struct snd_soc_dpcm *dpcm;
|
struct snd_soc_dpcm *dpcm;
|
||||||
int stream = substream->stream;
|
int stream = substream->stream;
|
||||||
|
@ -1641,10 +1641,10 @@ static void dpcm_runtime_merge_chan(struct snd_pcm_substream *substream,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream,
|
static void dpcm_runtime_setup_be_rate(struct snd_pcm_substream *substream)
|
||||||
struct snd_pcm_runtime *runtime)
|
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
|
||||||
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_pcm_hardware *hw = &runtime->hw;
|
struct snd_pcm_hardware *hw = &runtime->hw;
|
||||||
struct snd_soc_dpcm *dpcm;
|
struct snd_soc_dpcm *dpcm;
|
||||||
int stream = substream->stream;
|
int stream = substream->stream;
|
||||||
|
@ -1680,13 +1680,11 @@ static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream,
|
||||||
|
|
||||||
static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
|
static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
|
||||||
{
|
{
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
||||||
|
|
||||||
dpcm_runtime_setup_fe(substream);
|
dpcm_runtime_setup_fe(substream);
|
||||||
|
|
||||||
dpcm_runtime_merge_format(substream, runtime);
|
dpcm_runtime_setup_be_format(substream);
|
||||||
dpcm_runtime_merge_chan(substream, runtime);
|
dpcm_runtime_setup_be_chan(substream);
|
||||||
dpcm_runtime_merge_rate(substream, runtime);
|
dpcm_runtime_setup_be_rate(substream);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
|
static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
|
||||||
|
|
Loading…
Reference in a new issue