redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

em28xx: remove backward compat macro added on a previous fix

Browse source 
commit 50f3beb50a 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>
This commit is contained in:
Mauro Carvalho Chehab 2008-12-01 18:04:14 -02:00
parent 484ab62c5e
commit a693b0cdba
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/video/em28xx/em28xx-audio.c
View file

@ -75,9 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
struct em28xx *dev = urb->context; struct em28xx *dev = urb->context;
int i; int i;
unsigned int oldptr; unsigned int oldptr;
#ifdef NO_PCM_LOCK
unsigned long flags;
#endif
int period_elapsed = 0; int period_elapsed = 0;
int status; int status;
unsigned char *cp; unsigned char *cp;
@ -98,9 +95,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
if (!length) if (!length)
continue; continue;
#ifdef NO_PCM_LOCK
spin_lock_irqsave(&dev->adev->slock, flags);
#endif
oldptr = dev->adev->hwptr_done_capture; oldptr = dev->adev->hwptr_done_capture;
if (oldptr + length >= runtime->buffer_size) { if (oldptr + length >= runtime->buffer_size) {
unsigned int cnt = unsigned int cnt =
@ -114,9 +108,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
length * stride); length * stride);
} }
#ifndef NO_PCM_LOCK
snd_pcm_stream_lock(substream); snd_pcm_stream_lock(substream);
#endif
dev->adev->hwptr_done_capture += length; dev->adev->hwptr_done_capture += length;
if (dev->adev->hwptr_done_capture >= if (dev->adev->hwptr_done_capture >=
@ -132,11 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
period_elapsed = 1; period_elapsed = 1;
} }
#ifdef NO_PCM_LOCK
spin_unlock_irqrestore(&dev->adev->slock, flags);
#else
snd_pcm_stream_unlock(substream); snd_pcm_stream_unlock(substream);
#endif
} }
if (period_elapsed) if (period_elapsed)
snd_pcm_period_elapsed(substream); snd_pcm_period_elapsed(substream);