em28xx: remove backward compat macro added on a previous fix
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 1 Dec 2008 20:04:14 +0000 (18:04 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 1 Dec 2008 20:04:14 +0000 (18:04 -0200)
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>
drivers/media/video/em28xx/em28xx-audio.c

index 90236bbfe66ad61ea13affcd86c6409aa90f20d6..7a8d49ef646e62cb22127dd9387070dfcc1db22e 100644 (file)
@@ -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;
@@ -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 =
@@ -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 >=
@@ -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);