Commit c471fdd1 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: dapm: Factor out duplicated code in soc_dapm_stream_event() 



In soc_dapm_stream_event() we have the same code twice, once for the codec_dai
and once for the cpu_dai.  This patch factors the duplicated code out into a
separate function. This will make it easier to modify the implementation (since
there is only one place that needs to be updated) and also easier to add support
for more than two DAIs per DAI link.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 34775012

sound/soc/soc-dapm.c

+16 −35
Original line number Diff line number Diff line
@@ -3510,32 +3510,25 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
	}

}



static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,

static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream,

	int event)

{

	struct snd_soc_dapm_widget *w;



	struct snd_soc_dapm_widget *w_cpu, *w_codec;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

		w_cpu = cpu_dai->playback_widget;

		w_codec = codec_dai->playback_widget;

	} else {

		w_cpu = cpu_dai->capture_widget;

		w_codec = codec_dai->capture_widget;

	}



	if (w_cpu) {

	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		w = dai->playback_widget;

	else

		w = dai->capture_widget;



		dapm_mark_dirty(w_cpu, "stream event");

	if (w) {

		dapm_mark_dirty(w, "stream event");



		switch (event) {

		case SND_SOC_DAPM_STREAM_START:

			w_cpu->active = 1;

			w->active = 1;

			break;

		case SND_SOC_DAPM_STREAM_STOP:

			w_cpu->active = 0;

			w->active = 0;

			break;

		case SND_SOC_DAPM_STREAM_SUSPEND:

		case SND_SOC_DAPM_STREAM_RESUME:
@@ -3544,26 +3537,14 @@ static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, 
			break;

		}

	}



	if (w_codec) {



		dapm_mark_dirty(w_codec, "stream event");



		switch (event) {

		case SND_SOC_DAPM_STREAM_START:

			w_codec->active = 1;

			break;

		case SND_SOC_DAPM_STREAM_STOP:

			w_codec->active = 0;

			break;

		case SND_SOC_DAPM_STREAM_SUSPEND:

		case SND_SOC_DAPM_STREAM_RESUME:

		case SND_SOC_DAPM_STREAM_PAUSE_PUSH:

		case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:

			break;

		}

}



static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,

	int event)

{

	soc_dapm_dai_stream_event(rtd->cpu_dai, stream, event);

	soc_dapm_dai_stream_event(rtd->codec_dai, stream, event);



	dapm_power_widgets(rtd->card, event);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE