Skip to content

Commit

Permalink
em28xx: remove backward compat macro added on a previous fix
Browse files Browse the repository at this point in the history
commit 50f3beb 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>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 1, 2008
1 parent 484ab62 commit a693b0c
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/media/video/em28xx/em28xx-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
struct em28xx *dev = urb->context;
int i;
unsigned int oldptr;
#ifdef NO_PCM_LOCK
unsigned long flags;
#endif
int period_elapsed = 0;
int status;
unsigned char *cp;
Expand All @@ -98,9 +95,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
if (!length)
continue;

#ifdef NO_PCM_LOCK
spin_lock_irqsave(&dev->adev->slock, flags);
#endif
oldptr = dev->adev->hwptr_done_capture;
if (oldptr + length >= runtime->buffer_size) {
unsigned int cnt =
Expand All @@ -114,9 +108,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
length * stride);
}

#ifndef NO_PCM_LOCK
snd_pcm_stream_lock(substream);
#endif

dev->adev->hwptr_done_capture += length;
if (dev->adev->hwptr_done_capture >=
Expand All @@ -132,11 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
period_elapsed = 1;
}

#ifdef NO_PCM_LOCK
spin_unlock_irqrestore(&dev->adev->slock, flags);
#else
snd_pcm_stream_unlock(substream);
#endif
}
if (period_elapsed)
snd_pcm_period_elapsed(substream);
Expand Down

0 comments on commit a693b0c

Please sign in to comment.