Commit aa45eeee authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-audio: Remove superfluous open flag 



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: default avatarTakashi Iwai <tiwai@suse.de>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 626f28d5

drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c

+2 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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);



	/* We get called only if playback was triggered, So, the number of buffers we retrieve in
@@ -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);

	}

	if (alsa_stream->chip)

		alsa_stream->chip->alsa_stream[alsa_stream->idx] = NULL;

	/*

drivers/staging/vc04_services/bcm2835-audio/bcm2835.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ struct bcm2835_alsa_stream { 


	spinlock_t lock;



	int open;

	int running;

	int draining;

CRA Git | Maintained and supported by SUSTech CRA and CCSE