ASoC: Use core pm_runtime callbacks for omap-mcpdm
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Dec 2011 20:20:47 +0000 (20:20 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 8 Dec 2011 01:22:04 +0000 (09:22 +0800)
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>
sound/soc/omap/omap-mcpdm.c

index b50ac60be7dba5e2e6cf49d6df4e5ba14d51dd21..0e25df4fa9e5cf20e380582a36082e23596d2f0b 100644 (file)
@@ -266,8 +266,6 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
        mutex_lock(&mcpdm->mutex);
 
        if (!dai->active) {
-               pm_runtime_get_sync(mcpdm->dev);
-
                /* Enable watch dog for ES above ES 1.0 to avoid saturation */
                if (omap_rev() != OMAP4430_REV_ES1_0) {
                        u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
@@ -295,9 +293,6 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
                        omap_mcpdm_stop(mcpdm);
                        omap_mcpdm_close_streams(mcpdm);
                }
-
-               if (!omap_mcpdm_active(mcpdm))
-                       pm_runtime_put_sync(mcpdm->dev);
        }
 
        mutex_unlock(&mcpdm->mutex);