renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
Code

Staging: line6: fix checkpatch errors in capture.c

Browse Source 
2 errors left, but they are minor.
Lots of warnings also fixed up.

Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-02-27 22:39:22 -08:00
parent a49e483835
commit 6efc5667ef
1 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
drivers/staging/line6/capture.c
View File

@ -35,7 +35,7 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream)
spin_lock_irqsave(&line6pcm->lock_audio_in, flags); spin_lock_irqsave(&line6pcm->lock_audio_in, flags);
index = find_first_zero_bit(&line6pcm->active_urb_in, LINE6_ISO_BUFFERS); index = find_first_zero_bit(&line6pcm->active_urb_in, LINE6_ISO_BUFFERS);
if(index < 0 || index >= LINE6_ISO_BUFFERS) { if (index < 0 || index >= LINE6_ISO_BUFFERS) {
spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags); spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags);
dev_err(s2m(substream), "no free URB found\n"); dev_err(s2m(substream), "no free URB found\n");
return -EINVAL; return -EINVAL;
@ -44,7 +44,7 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream)
urb_in = line6pcm->urb_audio_in[index]; urb_in = line6pcm->urb_audio_in[index];
urb_size = 0; urb_size = 0;
for(i = 0; i < LINE6_ISO_PACKETS; ++i) { for (i = 0; i < LINE6_ISO_PACKETS; ++i) {
struct usb_iso_packet_descriptor *fin = &urb_in->iso_frame_desc[i]; struct usb_iso_packet_descriptor *fin = &urb_in->iso_frame_desc[i];
fin->offset = urb_size; fin->offset = urb_size;
fin->length = line6pcm->max_packet_size; fin->length = line6pcm->max_packet_size;
@ -55,7 +55,7 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream)
urb_in->transfer_buffer_length = urb_size; urb_in->transfer_buffer_length = urb_size;
urb_in->context = substream; urb_in->context = substream;
if(usb_submit_urb(urb_in, GFP_ATOMIC) == 0) if (usb_submit_urb(urb_in, GFP_ATOMIC) == 0)
set_bit(index, &line6pcm->active_urb_in); set_bit(index, &line6pcm->active_urb_in);
else else
dev_err(s2m(substream), "URB in #%d submission failed\n", index); dev_err(s2m(substream), "URB in #%d submission failed\n", index);
@ -71,9 +71,11 @@ static int submit_audio_in_all_urbs(struct snd_pcm_substream *substream)
{ {
int ret, i; int ret, i;
for(i = 0; i < LINE6_ISO_BUFFERS; ++i) for (i = 0; i < LINE6_ISO_BUFFERS; ++i) {
if((ret = submit_audio_in_urb(substream)) < 0) ret = submit_audio_in_urb(substream);
if (ret < 0)
return ret; return ret;
}
return 0; return 0;
} }
@ -85,9 +87,9 @@ static void unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm)
{ {
unsigned int i; unsigned int i;
for(i = LINE6_ISO_BUFFERS; i--;) { for (i = LINE6_ISO_BUFFERS; i--;) {
if(test_bit(i, &line6pcm->active_urb_in)) { if (test_bit(i, &line6pcm->active_urb_in)) {
if(!test_and_set_bit(i, &line6pcm->unlink_urb_in)) { if (!test_and_set_bit(i, &line6pcm->unlink_urb_in)) {
struct urb *u = line6pcm->urb_audio_in[i]; struct urb *u = line6pcm->urb_audio_in[i];
usb_unlink_urb(u); usb_unlink_urb(u);
} }
@ -96,7 +98,8 @@ static void unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm)
} }
/* /*
Wait until unlinking of all currently active capture URBs has been finished. Wait until unlinking of all currently active capture URBs has been
finished.
*/ */
static void wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm) static void wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm)
{ {
@ -110,7 +113,7 @@ static void wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm)
if (test_bit(i, &line6pcm->active_urb_in)) if (test_bit(i, &line6pcm->active_urb_in))
alive++; alive++;
} }
if (! alive) if (!alive)
break; break;
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1); schedule_timeout(1);
@ -146,12 +149,12 @@ static void audio_in_callback(struct urb *urb)
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
/* find index of URB */ /* find index of URB */
for(index = 0; index < LINE6_ISO_BUFFERS; ++index) for (index = 0; index < LINE6_ISO_BUFFERS; ++index)
if(urb == line6pcm->urb_audio_in[index]) if (urb == line6pcm->urb_audio_in[index])
break; break;
#if DO_DUMP_PCM_RECEIVE #if DO_DUMP_PCM_RECEIVE
for(i = 0; i < LINE6_ISO_PACKETS; ++i) { for (i = 0; i < LINE6_ISO_PACKETS; ++i) {
struct usb_iso_packet_descriptor *fout = &urb->iso_frame_desc[i]; struct usb_iso_packet_descriptor *fout = &urb->iso_frame_desc[i];
line6_write_hexdump(line6pcm->line6, 'C', urb->transfer_buffer + fout->offset, fout->length); line6_write_hexdump(line6pcm->line6, 'C', urb->transfer_buffer + fout->offset, fout->length);
} }
@ -159,12 +162,12 @@ static void audio_in_callback(struct urb *urb)
spin_lock_irqsave(&line6pcm->lock_audio_in, flags); spin_lock_irqsave(&line6pcm->lock_audio_in, flags);
for(i = 0; i < LINE6_ISO_PACKETS; ++i) { for (i = 0; i < LINE6_ISO_PACKETS; ++i) {
char *fbuf; char *fbuf;
int fsize; int fsize;
struct usb_iso_packet_descriptor *fin = &urb->iso_frame_desc[i]; struct usb_iso_packet_descriptor *fin = &urb->iso_frame_desc[i];
if(fin->status == -18) { if (fin->status == -18) {
shutdown = 1; shutdown = 1;
break; break;
} }
@ -173,10 +176,10 @@ static void audio_in_callback(struct urb *urb)
fsize = fin->actual_length; fsize = fin->actual_length;
length += fsize; length += fsize;
if(fsize > 0) { if (fsize > 0) {
frames = fsize / bytes_per_frame; frames = fsize / bytes_per_frame;
if(line6pcm->pos_in_done + frames > runtime->buffer_size) { if (line6pcm->pos_in_done + frames > runtime->buffer_size) {
/* /*
The transferred area goes over buffer boundary, The transferred area goes over buffer boundary,
copy two separate chunks. copy two separate chunks.
@ -184,34 +187,32 @@ static void audio_in_callback(struct urb *urb)
int len; int len;
len = runtime->buffer_size - line6pcm->pos_in_done; len = runtime->buffer_size - line6pcm->pos_in_done;
if(len > 0) { if (len > 0) {
memcpy(runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, len * bytes_per_frame); memcpy(runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, len * bytes_per_frame);
memcpy(runtime->dma_area, fbuf + len * bytes_per_frame, (frames - len) * bytes_per_frame); memcpy(runtime->dma_area, fbuf + len * bytes_per_frame, (frames - len) * bytes_per_frame);
} } else
else
dev_err(s2m(substream), "driver bug: len = %d\n", len); /* this is somewhat paranoid */ dev_err(s2m(substream), "driver bug: len = %d\n", len); /* this is somewhat paranoid */
} } else {
else {
/* copy single chunk */ /* copy single chunk */
memcpy(runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, fsize * bytes_per_frame); memcpy(runtime->dma_area + line6pcm->pos_in_done * bytes_per_frame, fbuf, fsize * bytes_per_frame);
} }
if((line6pcm->pos_in_done += frames) >= runtime->buffer_size) if ((line6pcm->pos_in_done += frames) >= runtime->buffer_size)
line6pcm->pos_in_done -= runtime->buffer_size; line6pcm->pos_in_done -= runtime->buffer_size;
} }
} }
clear_bit(index, &line6pcm->active_urb_in); clear_bit(index, &line6pcm->active_urb_in);
if(test_bit(index, &line6pcm->unlink_urb_in)) if (test_bit(index, &line6pcm->unlink_urb_in))
shutdown = 1; shutdown = 1;
spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags); spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags);
if(!shutdown) { if (!shutdown) {
submit_audio_in_urb(substream); submit_audio_in_urb(substream);
if((line6pcm->bytes_in += length) >= line6pcm->period_in) { if ((line6pcm->bytes_in += length) >= line6pcm->period_in) {
line6pcm->bytes_in -= line6pcm->period_in; line6pcm->bytes_in -= line6pcm->period_in;
snd_pcm_period_elapsed(substream); snd_pcm_period_elapsed(substream);
} }
@ -225,8 +226,10 @@ static int snd_line6_capture_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
if((err = snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, err = snd_pcm_hw_constraint_ratdens(runtime, 0,
(&line6pcm->properties->snd_line6_rates))) < 0) SNDRV_PCM_HW_PARAM_RATE,
(&line6pcm->properties->snd_line6_rates));
if (err < 0)
return err; return err;
runtime->hw = line6pcm->properties->snd_line6_capture_hw; runtime->hw = line6pcm->properties->snd_line6_capture_hw;
@ -240,30 +243,33 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream)
} }
/* hw_params capture callback */ /* hw_params capture callback */
static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params) static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{ {
int ret; int ret;
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
/* -- Florian Demski [FD] */ /* -- Florian Demski [FD] */
/* don't ask me why, but this fixes the bug on my machine */ /* don't ask me why, but this fixes the bug on my machine */
if ( line6pcm == NULL ) { if (line6pcm == NULL) {
if ( substream->pcm == NULL ) if (substream->pcm == NULL)
return -ENOMEM; return -ENOMEM;
if ( substream->pcm->private_data == NULL ) if (substream->pcm->private_data == NULL)
return -ENOMEM; return -ENOMEM;
substream->private_data = substream->pcm->private_data; substream->private_data = substream->pcm->private_data;
line6pcm = snd_pcm_substream_chip( substream ); line6pcm = snd_pcm_substream_chip(substream);
} }
/* -- [FD] end */ /* -- [FD] end */
if((ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0) ret = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
if (ret < 0)
return ret; return ret;
line6pcm->period_in = params_period_bytes(hw_params); line6pcm->period_in = params_period_bytes(hw_params);
line6pcm->buffer_in = kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS * LINE6_ISO_PACKET_SIZE_MAX, GFP_KERNEL); line6pcm->buffer_in = kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS * LINE6_ISO_PACKET_SIZE_MAX, GFP_KERNEL);
if(!line6pcm->buffer_in) { if (!line6pcm->buffer_in) {
dev_err(s2m(substream), "cannot malloc buffer_in\n"); dev_err(s2m(substream), "cannot malloc buffer_in\n");
return -ENOMEM; return -ENOMEM;
} }
@ -277,10 +283,8 @@ static int snd_line6_capture_hw_free(struct snd_pcm_substream *substream)
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
unlink_wait_clear_audio_in_urbs(line6pcm); unlink_wait_clear_audio_in_urbs(line6pcm);
if(line6pcm->buffer_in) { kfree(line6pcm->buffer_in);
kfree(line6pcm->buffer_in); line6pcm->buffer_in = NULL;
line6pcm->buffer_in = NULL;
}
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
@ -292,12 +296,12 @@ int snd_line6_capture_trigger(struct snd_pcm_substream *substream, int cmd)
int err; int err;
line6pcm->count_in = 0; line6pcm->count_in = 0;
switch(cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
if(!test_and_set_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags)) { if (!test_and_set_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags)) {
err = submit_audio_in_all_urbs(substream); err = submit_audio_in_all_urbs(substream);
if(err < 0) { if (err < 0) {
clear_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags); clear_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags);
return err; return err;
} }
@ -306,7 +310,7 @@ int snd_line6_capture_trigger(struct snd_pcm_substream *substream, int cmd)
break; break;
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
if(test_and_clear_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags)) if (test_and_clear_bit(BIT_RUNNING_CAPTURE, &line6pcm->flags))
unlink_audio_in_urbs(line6pcm); unlink_audio_in_urbs(line6pcm);
break; break;
@ -343,13 +347,13 @@ int create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
int i; int i;
/* create audio URBs and fill in constant values: */ /* create audio URBs and fill in constant values: */
for(i = 0; i < LINE6_ISO_BUFFERS; ++i) { for (i = 0; i < LINE6_ISO_BUFFERS; ++i) {
struct urb *urb; struct urb *urb;
/* URB for audio in: */ /* URB for audio in: */
urb = line6pcm->urb_audio_in[i] = usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL); urb = line6pcm->urb_audio_in[i] = usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);
if(urb == NULL) { if (urb == NULL) {
dev_err(line6pcm->line6->ifcdev, "Out of memory\n"); dev_err(line6pcm->line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }