Commit c688cf1d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown

ASoC: SOF: (cosmetic) use for_each_pcm_streams() in sof_dai_load()

Use for_each_pcm_streams() to enumerate streams in sof_dai_load()
instead of doing that manually.
Signed-off-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200325211233.27394-3-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 66de6beb
...@@ -2448,7 +2448,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -2448,7 +2448,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
struct snd_soc_tplg_stream_caps *caps; struct snd_soc_tplg_stream_caps *caps;
struct snd_soc_tplg_private *private = &pcm->priv; struct snd_soc_tplg_private *private = &pcm->priv;
struct snd_sof_pcm *spcm; struct snd_sof_pcm *spcm;
int stream = SNDRV_PCM_STREAM_PLAYBACK; int stream;
int ret = 0; int ret = 0;
/* nothing to do for BEs atm */ /* nothing to do for BEs atm */
...@@ -2460,8 +2460,9 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -2460,8 +2460,9 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
return -ENOMEM; return -ENOMEM;
spcm->scomp = scomp; spcm->scomp = scomp;
spcm->stream[SNDRV_PCM_STREAM_PLAYBACK].comp_id = COMP_ID_UNASSIGNED;
spcm->stream[SNDRV_PCM_STREAM_CAPTURE].comp_id = COMP_ID_UNASSIGNED; for_each_pcm_streams(stream)
spcm->stream[stream].comp_id = COMP_ID_UNASSIGNED;
spcm->pcm = *pcm; spcm->pcm = *pcm;
dev_dbg(scomp->dev, "tplg: load pcm %s\n", pcm->dai_name); dev_dbg(scomp->dev, "tplg: load pcm %s\n", pcm->dai_name);
...@@ -2482,8 +2483,10 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -2482,8 +2483,10 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
if (!spcm->pcm.playback) if (!spcm->pcm.playback)
goto capture; goto capture;
stream = SNDRV_PCM_STREAM_PLAYBACK;
dev_vdbg(scomp->dev, "tplg: pcm %s stream tokens: playback d0i3:%d\n", dev_vdbg(scomp->dev, "tplg: pcm %s stream tokens: playback d0i3:%d\n",
spcm->pcm.pcm_name, spcm->stream[0].d0i3_compatible); spcm->pcm.pcm_name, spcm->stream[stream].d0i3_compatible);
caps = &spcm->pcm.caps[stream]; caps = &spcm->pcm.caps[stream];
...@@ -2513,7 +2516,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, ...@@ -2513,7 +2516,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
return ret; return ret;
dev_vdbg(scomp->dev, "tplg: pcm %s stream tokens: capture d0i3:%d\n", dev_vdbg(scomp->dev, "tplg: pcm %s stream tokens: capture d0i3:%d\n",
spcm->pcm.pcm_name, spcm->stream[1].d0i3_compatible); spcm->pcm.pcm_name, spcm->stream[stream].d0i3_compatible);
caps = &spcm->pcm.caps[stream]; caps = &spcm->pcm.caps[stream];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment