From: Matt Mullins <mmullins@mmlx.us>
Date: Sat, 30 May 2015 17:58:13 +0000 (-0700)
Subject: Remove rendundant snd_compress_wait_for_drain.
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=c0fb39601fd0b0987acefc4ef442f70a83b5c263;p=linux-edison.git

Remove rendundant snd_compress_wait_for_drain.

This removes the version of the function from the squashed Edison patch,
leaving behind the linux-stable.
---

diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 8dc970bcfd2..391832066ab 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -703,27 +703,6 @@ EXPORT_SYMBOL(snd_compr_stop);
 
 static int snd_compress_wait_for_drain(struct snd_compr_stream *stream)
 {
-	/*
-	 * We are called with lock held. So drop the lock while we wait for
-	 * drain complete notfication from the driver
-	 *
-	 * It is expected that driver will notify the drain completion and then
-	 * stream will be moved to SETUP state, even if draining resulted in an
-	 * error. We can trigger next track after this.
-	 */
-	stream->runtime->state = SNDRV_PCM_STATE_DRAINING;
-	mutex_unlock(&stream->device->lock);
-
-	wait_event(stream->runtime->wait, stream->runtime->drain_wake);
-
-	wake_up(&stream->runtime->sleep);
-	mutex_lock(&stream->device->lock);
-
-	return 0;
-}
-
-static int snd_compress_wait_for_drain(struct snd_compr_stream *stream)
-{
 	int ret;
 
 	/*