Revert "ASoC: SOF: Intel: hda-dai-ops: fix HDaudio link format"

This reverts commit 7f9512a.

commit 7f9512a ("ASoC: SOF: Intel: hda-dai-ops: fix HDaudio link
format") added up all DAIs channels for SoundWire aggregation mode. That
was correct because we used a DMA for all DAIs. But, it is not valid
anymore after we use a DMA for each DAI.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

sound/soc/sof/intel/hda-dai-ops.c

@@ -226,34 +226,16 @@ static unsigned int generic_calc_stream_format(struct snd_sof_dev *sdev,
 					       struct snd_pcm_substream *substream,
 					       struct snd_pcm_hw_params *params)
 {
-	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-	struct snd_soc_dai_link_ch_map *ch_maps;
 	unsigned int format_val;
 	unsigned int bits;
-	int num_channels;
-	u32 ch_mask = 0;
-	int i;
-
-	/*
-	 * if the multiple dais are handled by the same dailink, we may need to update the
-	 * stream channel count - the params are modified in soc-pcm based on the ch_maps info
-	 */
-	for_each_link_ch_maps(rtd->dai_link, i, ch_maps)
-		ch_mask |= ch_maps->ch_mask;
-
-	num_channels = ch_mask ? hweight_long(ch_mask) : params_channels(params);
-
-	if (num_channels != params_channels(params))
-		dev_dbg(sdev->dev, "configuring stream format for %d channels, params_channels was %d\n",
-			num_channels, params_channels(params));
 
 	bits = snd_hdac_stream_format_bits(params_format(params), SNDRV_PCM_SUBFORMAT_STD,
 					   params_physical_width(params));
 
-	format_val = snd_hdac_stream_format(num_channels, bits, params_rate(params));
+	format_val = snd_hdac_stream_format(params_channels(params), bits, params_rate(params));
 
 	dev_dbg(sdev->dev, "format_val=%#x, rate=%d, ch=%d, format=%d\n", format_val,
-		params_rate(params), num_channels, params_format(params));
+		params_rate(params), params_channels(params), params_format(params));
 
 	return format_val;
 }