Merge "Revert "SoC: soc-pcm: call pcm_new when creating new pcm"" (4a2732a9) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/soc-pcm.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -3255,9 +3255,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
		{
		struct snd_soc_dai *codec_dai;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		#ifdef CONFIG_AUDIO_QGKI
		struct snd_soc_component *component;
		#endif
		struct snd_soc_rtdcom_list *rtdcom;
		struct snd_pcm *pcm;
		struct snd_pcm_str *stream;
		@@ -3347,22 +3344,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
		pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;
		if (capture)
		pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;
		#ifdef CONFIG_AUDIO_QGKI
		for_each_rtdcom(rtd, rtdcom) {
		component = rtdcom->component;

		if (!component->driver->pcm_new)
		continue;

		ret = component->driver->pcm_new(rtd);
		if (ret < 0) {
		dev_err(component->dev,
		"ASoC: pcm constructor failed: %d\n",
		ret);
		return ret;
		}
		}
		#endif
		goto out;
		}