leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: bcm2835-audio: Remove superfluous open flag

Browse Source 
All the alsa_stream->open flag checks in the current code are
redundant, and they cannot be racy.  For the code simplification,
let's remove the flag and its check.

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>
This commit is contained in:
Takashi Iwai 2018-09-04 17:58:36 +02:00 committed by Greg Kroah-Hartman
parent 626f28d51d
commit aa45eeee51
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
View File

@ -57,8 +57,7 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream)
audio_info("alsa_stream=%p substream=%p\n", alsa_stream,
alsa_stream ? alsa_stream->substream : 0);
if (alsa_stream->open)
consumed = bcm2835_audio_retrieve_buffers(alsa_stream);
consumed = bcm2835_audio_retrieve_buffers(alsa_stream);
/* We get called only if playback was triggered, So, the number of buffers we retrieve in
* each iteration are the buffers that have been played out already
@ -154,7 +153,6 @@ static int snd_bcm2835_playback_open_generic(
chip->alsa_stream[idx] = alsa_stream;
chip->opened |= (1 << idx);
alsa_stream->open = 1;
alsa_stream->draining = 1;
out:
@ -205,10 +203,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
alsa_stream->period_size = 0;
alsa_stream->buffer_size = 0;
if (alsa_stream->open) {
alsa_stream->open = 0;
bcm2835_audio_close(alsa_stream);
}
bcm2835_audio_close(alsa_stream);
if (alsa_stream->chip)
alsa_stream->chip->alsa_stream[alsa_stream->idx] = NULL;
/*

1
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
View File

@ -121,7 +121,6 @@ struct bcm2835_alsa_stream {
spinlock_t lock;
int open;
int running;
int draining;