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: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200325211233.27394-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 058de94fb8cf63c9f3618b1df09e2eb89343afa8..54437caf9488ccd9c5cf037be27a4c3f0fb8a15e 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -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_private *private = &pcm->priv;
        struct snd_sof_pcm *spcm;
-       int stream = SNDRV_PCM_STREAM_PLAYBACK;
+       int stream;
        int ret = 0;
 
        /* nothing to do for BEs atm */
@@ -2460,8 +2460,9 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
                return -ENOMEM;
 
        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;
        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,
        if (!spcm->pcm.playback)
                goto capture;
 
+       stream = SNDRV_PCM_STREAM_PLAYBACK;
+
        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];
 
@@ -2513,7 +2516,7 @@ capture:
                return ret;
 
        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];