From a020aa4ae0da05a479bdc79b91ee248542e1f41a Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 20 May 2020 08:41:42 +0800 Subject: [PATCH] Revert "SoC: soc-pcm: call pcm_new when creating new pcm" This reverts commit 1a80306d3d343f920f16ee2d5d3dcf4e11430cca. This has been done in ASoC with snd_soc_pcm_component_new. There's no need to make this change. Change-Id: I72560f6ed265ebf6981ad7a59a3bc75d3e5a3a74 Signed-off-by: Meng Wang --- sound/soc/soc-pcm.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index bdbb175c84c7..699f2429dd1b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -3250,9 +3250,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; @@ -3342,22 +3339,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; }