ASoC: soc-core: use for_each_pcm_streams() macro (d74c2a15) · Commits · 戴 / test

sound/soc/soc-core.c

+13 −18

Original line number	Diff line number	Diff line
		@@ -432,6 +432,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
		struct snd_soc_component *component;
		struct device *dev;
		int ret;
		int stream;

		/*
		* for rtd->dev
		@@ -466,10 +467,10 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(

		rtd->dev = dev;
		INIT_LIST_HEAD(&rtd->list);
		INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);
		INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].be_clients);
		INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].fe_clients);
		INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients);
		for_each_pcm_streams(stream) {
		INIT_LIST_HEAD(&rtd->dpcm[stream].be_clients);
		INIT_LIST_HEAD(&rtd->dpcm[stream].fe_clients);
		}
		dev_set_drvdata(dev, rtd);
		INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work);

		@@ -559,16 +560,13 @@ int snd_soc_suspend(struct device *dev)
		snd_soc_flush_all_delayed_work(card);

		for_each_card_rtds(card, rtd) {
		int stream;

		if (rtd->dai_link->ignore_suspend)
		continue;

		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_SUSPEND);

		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_CAPTURE,
		for_each_pcm_streams(stream)
		snd_soc_dapm_stream_event(rtd, stream,
		SND_SOC_DAPM_STREAM_SUSPEND);
		}

		@@ -665,16 +663,13 @@ static void soc_resume_deferred(struct work_struct *work)
		}

		for_each_card_rtds(card, rtd) {
		int stream;

		if (rtd->dai_link->ignore_suspend)
		continue;

		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_RESUME);

		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_CAPTURE,
		for_each_pcm_streams(stream)
		snd_soc_dapm_stream_event(rtd, stream,
		SND_SOC_DAPM_STREAM_RESUME);
		}

Admin message