diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-03 15:20:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-07 20:21:51 -0500 |
commit | 06d07b6b1cf46ad1bfd15ab1ba84c0d7ee6dab31 (patch) | |
tree | ac0627a2f1c6358479002352f3e63b1d8fee201b /sound/soc/omap | |
parent | d6652ef8229e9953543f41d8e081c23e653f0044 (diff) |
ASoC: Use core pm_runtime callbacks for omap-dmic
Now that the core holds a pm_runtime reference to the device while the
link is active there is no need for the driver to do so.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/omap-dmic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 9c73c0c70d39..0855c1cfa7fd 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c | |||
@@ -114,7 +114,6 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream, | |||
114 | mutex_lock(&dmic->mutex); | 114 | mutex_lock(&dmic->mutex); |
115 | 115 | ||
116 | if (!dai->active) { | 116 | if (!dai->active) { |
117 | pm_runtime_get_sync(dmic->dev); | ||
118 | snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24); | 117 | snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24); |
119 | dmic->active = 1; | 118 | dmic->active = 1; |
120 | } else { | 119 | } else { |
@@ -133,10 +132,8 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream, | |||
133 | 132 | ||
134 | mutex_lock(&dmic->mutex); | 133 | mutex_lock(&dmic->mutex); |
135 | 134 | ||
136 | if (!dai->active) { | 135 | if (!dai->active) |
137 | pm_runtime_put_sync(dmic->dev); | ||
138 | dmic->active = 0; | 136 | dmic->active = 0; |
139 | } | ||
140 | 137 | ||
141 | mutex_unlock(&dmic->mutex); | 138 | mutex_unlock(&dmic->mutex); |
142 | } | 139 | } |