summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-03-05 13:17:48 +0100
committerMark Brown <broonie@linaro.org>2014-03-06 17:04:56 +0800
commit3d59400fe47e7e8bfb024cd1651433bef42e268e (patch)
treef3a0162a203e1abb9063f662b623d4972221d752 /sound/soc/soc-pcm.c
parentcdde4ccb14b4959bd1c96a07367bf02b746328d3 (diff)
ASoC: Move ignore_pmdown_time from CODEC to component
In preparation for componentization move the ignore_pmdown_time field from the snd_soc_codec struct to the snd_soc_component struct. Set it to true for non CODEC components for now. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 98b46295785d..2cedf09f6d96 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -107,17 +107,11 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream)
*/
bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd)
{
- bool ignore = true;
-
if (!rtd->pmdown_time || rtd->dai_link->ignore_pmdown_time)
return true;
- if (rtd->cpu_dai->codec)
- ignore &= rtd->cpu_dai->codec->ignore_pmdown_time;
-
- ignore &= rtd->codec_dai->codec->ignore_pmdown_time;
-
- return ignore;
+ return rtd->cpu_dai->component->ignore_pmdown_time &&
+ rtd->codec_dai->component->ignore_pmdown_time;
}
/**