From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 13 Jul 2011 22:15:57 +0000 (-0300)
Subject: [media] tm6000: remove a check for NO_PCM_LOCK
X-Git-Tag: v3.1-rc1~116^2~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b6d717fb8e261e9705d66351f425561f114d4b;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

[media] tm6000: remove a check for NO_PCM_LOCK

This was likely used by some test. There's no sense on keeping it
upstream.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index 2b96047..a588f29 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -254,9 +254,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size)
 		memcpy(runtime->dma_area + buf_pos * stride, buf,
 			length * stride);
 
-#ifndef NO_PCM_LOCK
        snd_pcm_stream_lock(substream);
-#endif
 
 	chip->buf_pos += length;
 	if (chip->buf_pos >= runtime->buffer_size)
@@ -268,9 +266,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size)
 		period_elapsed = 1;
 	}
 
-#ifndef NO_PCM_LOCK
        snd_pcm_stream_unlock(substream);
-#endif
 
 	if (period_elapsed)
 		snd_pcm_period_elapsed(substream);