Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a020aa4a authored by Meng Wang's avatar Meng Wang
Browse files

Revert "SoC: soc-pcm: call pcm_new when creating new pcm" 



This reverts commit 1a80306d.
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: default avatarMeng Wang <mengw@codeaurora.org>
parent 4fbfcf83

sound/soc/soc-pcm.c

+0 −19
Original line number Diff line number Diff line
@@ -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;

	}