Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beaff340 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
parent 06d07b6b

sound/soc/omap/omap-mcpdm.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -266,8 +266,6 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, 
	mutex_lock(&mcpdm->mutex);

	mutex_lock(&mcpdm->mutex);





	if (!dai->active) {

	if (!dai->active) {

		pm_runtime_get_sync(mcpdm->dev);



		/* Enable watch dog for ES above ES 1.0 to avoid saturation */

		/* Enable watch dog for ES above ES 1.0 to avoid saturation */

		if (omap_rev() != OMAP4430_REV_ES1_0) {

		if (omap_rev() != OMAP4430_REV_ES1_0) {

			u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);

			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_stop(mcpdm);

			omap_mcpdm_close_streams(mcpdm);

			omap_mcpdm_close_streams(mcpdm);

		}

		}



		if (!omap_mcpdm_active(mcpdm))

			pm_runtime_put_sync(mcpdm->dev);

	}

	}





	mutex_unlock(&mcpdm->mutex);

	mutex_unlock(&mcpdm->mutex);