ASoC: soc-pcm: fix 2 minor merge issues

Differences with the sof-dev-rebase branch

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Author: plbossart

sound/soc/soc-pcm.c

@@ -907,7 +907,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 config_err:
 	for_each_rtd_codec_dai(rtd, i, codec_dai)
 		snd_soc_dai_shutdown(codec_dai, substream);
-	i = rtd->num_cpus;
 cpu_dai_err:
 	for_each_rtd_cpu_dai(rtd, i, cpu_dai)
 		snd_soc_dai_shutdown(cpu_dai, substream);
@@ -2853,12 +2852,6 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
 		return -EINVAL;
 	}
 
-	if (fe->num_cpus > 1) {
-		dev_err(fe->dev,
-			"%s doesn't support Multi CPU yet\n", __func__);
-		return -EINVAL;
-	}
-
 	if (!fe->dai_link->dynamic)
 		return 0;