Revert "ASoC: Tegra: Acquire wake_lock during playback capture"
Sumit Bhattacharya [Fri, 20 Jan 2012 05:42:24 +0000 (10:42 +0530)]
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

sound/soc/tegra/tegra_pcm.c
sound/soc/tegra/tegra_pcm.h

index a27f65f..439e412 100644 (file)
@@ -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;
index 883c979..dbb9033 100644 (file)
 
 #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