aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcpdm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 15:20:47 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-07 20:22:04 -0500
commitbeaff340e04fc3a752aa2cca70195dd506deccef (patch)
tree7ad478b32b1302bcefb0f868ce7e42742f935408 /sound/soc/omap/omap-mcpdm.c
parent06d07b6b1cf46ad1bfd15ab1ba84c0d7ee6dab31 (diff)
ASoC: Use core pm_runtime callbacks for omap-mcpdm
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/omap-mcpdm.c')
-rw-r--r--sound/soc/omap/omap-mcpdm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index b50ac60be7db..0e25df4fa9e5 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -266,8 +266,6 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
266 mutex_lock(&mcpdm->mutex); 266 mutex_lock(&mcpdm->mutex);
267 267
268 if (!dai->active) { 268 if (!dai->active) {
269 pm_runtime_get_sync(mcpdm->dev);
270
271 /* Enable watch dog for ES above ES 1.0 to avoid saturation */ 269 /* Enable watch dog for ES above ES 1.0 to avoid saturation */
272 if (omap_rev() != OMAP4430_REV_ES1_0) { 270 if (omap_rev() != OMAP4430_REV_ES1_0) {
273 u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); 271 u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
@@ -295,9 +293,6 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
295 omap_mcpdm_stop(mcpdm); 293 omap_mcpdm_stop(mcpdm);
296 omap_mcpdm_close_streams(mcpdm); 294 omap_mcpdm_close_streams(mcpdm);
297 } 295 }
298
299 if (!omap_mcpdm_active(mcpdm))
300 pm_runtime_put_sync(mcpdm->dev);
301 } 296 }
302 297
303 mutex_unlock(&mcpdm->mutex); 298 mutex_unlock(&mcpdm->mutex);