aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-07-29 11:13:55 -0400
committerMark Brown <broonie@linaro.org>2013-07-29 13:40:59 -0400
commit564c65049eddb1a95b48958080db97eda88c98dd (patch)
treebfcb726569f7296f6875c564ba58276a0a36547a /include/sound/soc-dapm.h
parent60529c65ec3bc1a347f67eec1b1567efebbf7ce1 (diff)
ASoC: dapm: Move snd_soc_dapm_update from dapm context to card
The update field of a DAPM context is only assigned while the card's dapm_mutex is locked, the field is also cleared again while the mutex is stil locked. So there will only ever be one DAPM context at a time with a non-NULL update field. So it is safe to move the update field from the DAPM context struct to the card struct. Doing so will allow further cleanups in this area. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e77c6f5a8390..3397292d94c8 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -575,8 +575,6 @@ struct snd_soc_dapm_context {
575 struct delayed_work delayed_work; 575 struct delayed_work delayed_work;
576 unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ 576 unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
577 577
578 struct snd_soc_dapm_update *update;
579
580 void (*seq_notifier)(struct snd_soc_dapm_context *, 578 void (*seq_notifier)(struct snd_soc_dapm_context *,
581 enum snd_soc_dapm_type, int); 579 enum snd_soc_dapm_type, int);
582 580