You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From d9aef1329c29c20d8e0db9929a3235bfb1d718d3 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Tue, 4 Sep 2018 17:58:39 +0200
|
|
Subject: [PATCH] staging: bcm2835-audio: Kill unused spinlock
|
|
|
|
commit 5332f6f012c0bf3a45c77dbc0f79814443a884d4 upstream.
|
|
|
|
The alsa_stream->lock is never used. Kill it.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 2 --
|
|
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h | 2 --
|
|
2 files changed, 4 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
@@ -128,8 +128,6 @@ static int snd_bcm2835_playback_open_gen
|
|
alsa_stream->substream = substream;
|
|
alsa_stream->idx = idx;
|
|
|
|
- spin_lock_init(&alsa_stream->lock);
|
|
-
|
|
err = bcm2835_audio_open(alsa_stream);
|
|
if (err) {
|
|
kfree(alsa_stream);
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
|
|
@@ -119,8 +119,6 @@ struct bcm2835_alsa_stream {
|
|
struct snd_pcm_substream *substream;
|
|
struct snd_pcm_indirect pcm_indirect;
|
|
|
|
- spinlock_t lock;
|
|
-
|
|
int draining;
|
|
|
|
int channels;
|