aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-01 15:04:14 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-01 15:04:14 -0500
commita693b0cdba94f60f7ed43754d2c34151cdd11da5 (patch)
tree99cbf46748dfa4f35acc1d63ae51817f3e17ec9d /drivers/media
parent484ab62c5ee805c2bdc405a85a4e64da2722690f (diff)
em28xx: remove backward compat macro added on a previous fix
commit 50f3beb50abe0cc0228363af804e50e710b3e5b0 fixed em28xx-alsa locking schema. However, a backport macro was kept. This patch removes the macro, since it is not needed for the module compilation against upstream. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-audio.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 90236bbfe66a..7a8d49ef646e 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -75,9 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
75 struct em28xx *dev = urb->context; 75 struct em28xx *dev = urb->context;
76 int i; 76 int i;
77 unsigned int oldptr; 77 unsigned int oldptr;
78#ifdef NO_PCM_LOCK
79 unsigned long flags;
80#endif
81 int period_elapsed = 0; 78 int period_elapsed = 0;
82 int status; 79 int status;
83 unsigned char *cp; 80 unsigned char *cp;
@@ -98,9 +95,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
98 if (!length) 95 if (!length)
99 continue; 96 continue;
100 97
101#ifdef NO_PCM_LOCK
102 spin_lock_irqsave(&dev->adev->slock, flags);
103#endif
104 oldptr = dev->adev->hwptr_done_capture; 98 oldptr = dev->adev->hwptr_done_capture;
105 if (oldptr + length >= runtime->buffer_size) { 99 if (oldptr + length >= runtime->buffer_size) {
106 unsigned int cnt = 100 unsigned int cnt =
@@ -114,9 +108,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
114 length * stride); 108 length * stride);
115 } 109 }
116 110
117#ifndef NO_PCM_LOCK
118 snd_pcm_stream_lock(substream); 111 snd_pcm_stream_lock(substream);
119#endif
120 112
121 dev->adev->hwptr_done_capture += length; 113 dev->adev->hwptr_done_capture += length;
122 if (dev->adev->hwptr_done_capture >= 114 if (dev->adev->hwptr_done_capture >=
@@ -132,11 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
132 period_elapsed = 1; 124 period_elapsed = 1;
133 } 125 }
134 126
135#ifdef NO_PCM_LOCK
136 spin_unlock_irqrestore(&dev->adev->slock, flags);
137#else
138 snd_pcm_stream_unlock(substream); 127 snd_pcm_stream_unlock(substream);
139#endif
140 } 128 }
141 if (period_elapsed) 129 if (period_elapsed)
142 snd_pcm_period_elapsed(substream); 130 snd_pcm_period_elapsed(substream);