OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: core: Add one dai_get_widget helper instead of two rtd based ones 

Replace rtd_get_codec_widget() and rtd_get_cpu_widget() by a simple
dai_get_widget() in preparation for DAI-multicodec support, per Lars
suggestion.

No functional change.

Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Benoit Cousson 2014-04-24 14:01:45 +02:00 committed by Mark Brown
parent 503ae5e036
commit 3701861060
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/soc-pcm.c
View File

@ -1012,21 +1012,12 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card,
}
static inline struct snd_soc_dapm_widget *
rtd_get_cpu_widget(struct snd_soc_pcm_runtime *rtd, int stream)
dai_get_widget(struct snd_soc_dai *dai, int stream)
{
if (stream == SNDRV_PCM_STREAM_PLAYBACK)
return rtd->cpu_dai->playback_widget;
return dai->playback_widget;
else
return rtd->cpu_dai->capture_widget;
}
static inline struct snd_soc_dapm_widget *
rtd_get_codec_widget(struct snd_soc_pcm_runtime *rtd, int stream)
{
if (stream == SNDRV_PCM_STREAM_PLAYBACK)
return rtd->codec_dai->playback_widget;
else
return rtd->codec_dai->capture_widget;
return dai->capture_widget;
}
static int widget_in_list(struct snd_soc_dapm_widget_list *list,
@ -1076,14 +1067,14 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,
list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
/* is there a valid CPU DAI widget for this BE */
widget = rtd_get_cpu_widget(dpcm->be, stream);
widget = dai_get_widget(dpcm->be->cpu_dai, stream);
/* prune the BE if it's no longer in our active list */
if (widget && widget_in_list(list, widget))
continue;
/* is there a valid CODEC DAI widget for this BE */
widget = rtd_get_codec_widget(dpcm->be, stream);
widget = dai_get_widget(dpcm->be->codec_dai, stream);
/* prune the BE if it's no longer in our active list */
if (widget && widget_in_list(list, widget))