diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
commit | 53a2c4db8cf229047de88b3f1bd41d5a5d2756eb (patch) | |
tree | 46ab33e4c837e0b893ddf8fb3817dd3f6042eb32 /include | |
parent | da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb (diff) | |
parent | f9fa2b1855a9ece2ec2a4f54b7f9131cd89257d6 (diff) | |
download | linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.tar.gz linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.tar.bz2 linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.zip |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 6e89ef6c11c1..05aaaf689ac0 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -461,6 +461,7 @@ int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm); +int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm); int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, @@ -470,7 +471,6 @@ int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec); /* Mostly internal - should not normally be used */ -void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason); void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm); /* dapm path query */ diff --git a/include/sound/soc.h b/include/sound/soc.h index 37b470c1e127..075d7e8ba802 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1208,4 +1208,15 @@ extern struct dentry *snd_soc_debugfs_root; extern const struct dev_pm_ops snd_soc_pm_ops; +/* Helper functions */ +static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm) +{ + mutex_lock(&dapm->card->dapm_mutex); +} + +static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm) +{ + mutex_unlock(&dapm->card->dapm_mutex); +} + #endif |