Skip to content

Commit a693b0c

Browse files
author
Mauro Carvalho Chehab
committed
em28xx: remove backward compat macro added on a previous fix
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 <[email protected]>
1 parent 484ab62 commit a693b0c

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/media/video/em28xx/em28xx-audio.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
7575
struct em28xx *dev = urb->context;
7676
int i;
7777
unsigned int oldptr;
78-
#ifdef NO_PCM_LOCK
79-
unsigned long flags;
80-
#endif
8178
int period_elapsed = 0;
8279
int status;
8380
unsigned char *cp;
@@ -98,9 +95,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
9895
if (!length)
9996
continue;
10097

101-
#ifdef NO_PCM_LOCK
102-
spin_lock_irqsave(&dev->adev->slock, flags);
103-
#endif
10498
oldptr = dev->adev->hwptr_done_capture;
10599
if (oldptr + length >= runtime->buffer_size) {
106100
unsigned int cnt =
@@ -114,9 +108,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
114108
length * stride);
115109
}
116110

117-
#ifndef NO_PCM_LOCK
118111
snd_pcm_stream_lock(substream);
119-
#endif
120112

121113
dev->adev->hwptr_done_capture += length;
122114
if (dev->adev->hwptr_done_capture >=
@@ -132,11 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
132124
period_elapsed = 1;
133125
}
134126

135-
#ifdef NO_PCM_LOCK
136-
spin_unlock_irqrestore(&dev->adev->slock, flags);
137-
#else
138127
snd_pcm_stream_unlock(substream);
139-
#endif
140128
}
141129
if (period_elapsed)
142130
snd_pcm_period_elapsed(substream);

0 commit comments

Comments
 (0)