redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: line6: eliminate useless index_out variable

Browse source 
Playback urbs use the index_out counter to decide which part of the
playback buffer to use.  Since the urb already has a unique index in
range [0, LINE6_ISO_BUFFERS) there is no need to keep a separate
counter.

Use the urb index instead.  This also eliminates the possibility of two
urbs using the same playback buffer space if they ever complete
out-of-order for some reason.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Stefan Hajnoczi 2011-12-10 02:12:29 +01:00 committed by Greg Kroah-Hartman
parent 2f637ee42d
commit 153e38761d
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/line6/pcm.h
View file

@ -145,11 +145,6 @@ struct snd_line6_pcm {
*/
unsigned char *buffer_in;
/**
Temporary buffer index for playback.
*/
int index_out;
/**
Previously captured frame (for software monitoring).
*/

5
drivers/staging/line6/playback.c
View file

@ -192,13 +192,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
urb_frames = urb_size / bytes_per_frame;
urb_out->transfer_buffer =
line6pcm->buffer_out +
LINE6_ISO_PACKETS * line6pcm->max_packet_size * line6pcm->index_out;
index * LINE6_ISO_PACKETS * line6pcm->max_packet_size;
urb_out->transfer_buffer_length = urb_size;
urb_out->context = line6pcm;
if (++line6pcm->index_out == LINE6_ISO_BUFFERS)
line6pcm->index_out = 0;
if (test_bit(BIT_PCM_ALSA_PLAYBACK, &line6pcm->flags) &&
!test_bit(BIT_PAUSE_PLAYBACK, &line6pcm->flags)) {
struct snd_pcm_runtime *runtime =