diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2012-01-20 11:12:24 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-01-30 11:47:15 -0800 |
| commit | 13485d291aed28875f935afe89b70cd5056b861a (patch) | |
| tree | 6c4a6e78a7b76e2a92af7e4d289233292b8878ae /sound/soc | |
| parent | cbb5a3afaa0b0239e3b81d3531ad5fe3e4488b27 (diff) | |
Revert "ASoC: Tegra: Acquire wake_lock during playback capture"
This reverts commit 78d27b4b610fbe7d77e3cf43a3b82e15cf879d37.
Bug 916409
Reviewed-on: http://git-master/r/76446
Change-Id: I4288dc4d90b393dd8dbefd7e997b9bfceb49d564
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/77305
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/tegra/tegra_pcm.c | 20 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_pcm.h | 8 |
2 files changed, 0 insertions, 28 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index a27f65f68325..439e412f17c6 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c @@ -185,15 +185,6 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) if (ret < 0) goto err; -#ifdef CONFIG_HAS_WAKELOCK - snprintf(prtd->tegra_wake_lock_name, sizeof(prtd->tegra_wake_lock_name), - "tegra-pcm-%s-%d", - (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? "out" : "in", - substream->pcm->device); - wake_lock_init(&prtd->tegra_wake_lock, WAKE_LOCK_SUSPEND, - prtd->tegra_wake_lock_name); -#endif - return 0; err: @@ -211,10 +202,6 @@ static int tegra_pcm_close(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct tegra_runtime_data *prtd = runtime->private_data; -#ifdef CONFIG_HAS_WAKELOCK - wake_lock_destroy(&prtd->tegra_wake_lock); -#endif - if (prtd->dma_chan) tegra_dma_free_channel(prtd->dma_chan); @@ -259,9 +246,6 @@ static int tegra_pcm_trigger(struct snd_pcm_substream *substream, int cmd) /* Fall-through */ case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: -#ifdef CONFIG_HAS_WAKELOCK - wake_lock(&prtd->tegra_wake_lock); -#endif spin_lock_irqsave(&prtd->lock, flags); prtd->running = 1; spin_unlock_irqrestore(&prtd->lock, flags); @@ -276,10 +260,6 @@ static int tegra_pcm_trigger(struct snd_pcm_substream *substream, int cmd) spin_unlock_irqrestore(&prtd->lock, flags); tegra_dma_dequeue_req(prtd->dma_chan, &prtd->dma_req[0]); tegra_dma_dequeue_req(prtd->dma_chan, &prtd->dma_req[1]); - -#ifdef CONFIG_HAS_WAKELOCK - wake_unlock(&prtd->tegra_wake_lock); -#endif break; default: return -EINVAL; diff --git a/sound/soc/tegra/tegra_pcm.h b/sound/soc/tegra/tegra_pcm.h index 883c979268de..dbb90339fe0d 100644 --- a/sound/soc/tegra/tegra_pcm.h +++ b/sound/soc/tegra/tegra_pcm.h @@ -33,10 +33,6 @@ #include <mach/dma.h> -#ifdef CONFIG_HAS_WAKELOCK -#include <linux/wakelock.h> -#endif - struct tegra_pcm_dma_params { unsigned long addr; unsigned long wrap; @@ -54,10 +50,6 @@ struct tegra_runtime_data { int dma_req_idx; struct tegra_dma_req dma_req[2]; struct tegra_dma_channel *dma_chan; -#ifdef CONFIG_HAS_WAKELOCK - struct wake_lock tegra_wake_lock; - char tegra_wake_lock_name[32]; -#endif }; #endif |