From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
dpcm_init_runtime_hw() is now just verbose function.
This patch unpacks it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
sound/soc/soc-pcm.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index bb912a94e895..fd279fb28533 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1526,16 +1526,6 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
return err;
}
-static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,
- struct snd_soc_pcm_stream *stream)
-{
- struct snd_pcm_hardware *hw = &runtime->hw;
-
- soc_pcm_hw_update_rate(hw, stream);
- soc_pcm_hw_update_chan(hw, stream);
- soc_pcm_hw_update_format(hw, stream);
-}
-
static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime)
{
@@ -1669,6 +1659,8 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
soc_pcm_hw_init(hw);
for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
+ struct snd_soc_pcm_stream *stream;
+
/*
* Skip CPUs which don't support the current stream
* type. See soc_pcm_init_runtime_hw() for more details
@@ -1676,9 +1668,11 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
if (!snd_soc_dai_stream_valid(cpu_dai, substream->stream))
continue;
- dpcm_init_runtime_hw(runtime,
- snd_soc_dai_get_pcm_stream(cpu_dai,
- substream->stream));
+ stream = snd_soc_dai_get_pcm_stream(cpu_dai, substream->stream);
+
+ soc_pcm_hw_update_rate(hw, stream);
+ soc_pcm_hw_update_chan(hw, stream);
+ soc_pcm_hw_update_format(hw, stream);
}
dpcm_runtime_merge_format(substream, runtime);
--
2.25.1
