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

[ALSA] sound/usb/usbaudio.c: coding style

Browse Source 
Putting space between ! and variable is a strange coding style, fix
that, also make it fit into 80 columns where that is easy.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Pavel Machek 2008-04-14 13:15:56 +02:00 committed by Takashi Iwai
parent 2a56f51bcc
commit 07f51a7274
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
sound/usb/usbaudio.c
View File

@ -64,9 +64,10 @@ MODULE_SUPPORTED_DEVICE("{{Generic,USB Audio}}");
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Vendor ID for this card */ /* Vendor/product IDs for this card */
static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Product ID for this card */ static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
static int nrpacks = 8; /* max. number of packets per urb */ static int nrpacks = 8; /* max. number of packets per urb */
static int async_unlink = 1; static int async_unlink = 1;
static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/ static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/
@ -687,7 +688,7 @@ static void snd_complete_urb(struct urb *urb)
int err = 0; int err = 0;
if ((subs->running && subs->ops.retire(subs, substream->runtime, urb)) || if ((subs->running && subs->ops.retire(subs, substream->runtime, urb)) ||
! subs->running || /* can be stopped during retire callback */ !subs->running || /* can be stopped during retire callback */
(err = subs->ops.prepare(subs, substream->runtime, urb)) < 0 || (err = subs->ops.prepare(subs, substream->runtime, urb)) < 0 ||
(err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { (err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
clear_bit(ctx->index, &subs->active_mask); clear_bit(ctx->index, &subs->active_mask);
@ -710,7 +711,7 @@ static void snd_complete_sync_urb(struct urb *urb)
int err = 0; int err = 0;
if ((subs->running && subs->ops.retire_sync(subs, substream->runtime, urb)) || if ((subs->running && subs->ops.retire_sync(subs, substream->runtime, urb)) ||
! subs->running || /* can be stopped during retire callback */ !subs->running || /* can be stopped during retire callback */
(err = subs->ops.prepare_sync(subs, substream->runtime, urb)) < 0 || (err = subs->ops.prepare_sync(subs, substream->runtime, urb)) < 0 ||
(err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { (err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
clear_bit(ctx->index + 16, &subs->active_mask); clear_bit(ctx->index + 16, &subs->active_mask);
@ -740,7 +741,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
vfree(runtime->dma_area); vfree(runtime->dma_area);
} }
runtime->dma_area = vmalloc(size); runtime->dma_area = vmalloc(size);
if (! runtime->dma_area) if (!runtime->dma_area)
return -ENOMEM; return -ENOMEM;
runtime->dma_bytes = size; runtime->dma_bytes = size;
return 0; return 0;
@ -772,12 +773,12 @@ static int deactivate_urbs(struct snd_usb_substream *subs, int force, int can_sl
async = !can_sleep && async_unlink; async = !can_sleep && async_unlink;
if (! async && in_interrupt()) if (!async && in_interrupt())
return 0; return 0;
for (i = 0; i < subs->nurbs; i++) { for (i = 0; i < subs->nurbs; i++) {
if (test_bit(i, &subs->active_mask)) { if (test_bit(i, &subs->active_mask)) {
if (! test_and_set_bit(i, &subs->unlink_mask)) { if (!test_and_set_bit(i, &subs->unlink_mask)) {
struct urb *u = subs->dataurb[i].urb; struct urb *u = subs->dataurb[i].urb;
if (async) if (async)
usb_unlink_urb(u); usb_unlink_urb(u);
@ -789,7 +790,7 @@ static int deactivate_urbs(struct snd_usb_substream *subs, int force, int can_sl
if (subs->syncpipe) { if (subs->syncpipe) {
for (i = 0; i < SYNC_URBS; i++) { for (i = 0; i < SYNC_URBS; i++) {
if (test_bit(i+16, &subs->active_mask)) { if (test_bit(i+16, &subs->active_mask)) {
if (! test_and_set_bit(i+16, &subs->unlink_mask)) { if (!test_and_set_bit(i+16, &subs->unlink_mask)) {
struct urb *u = subs->syncurb[i].urb; struct urb *u = subs->syncurb[i].urb;
if (async) if (async)
usb_unlink_urb(u); usb_unlink_urb(u);
@ -1137,12 +1138,12 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
if (subs->fmt_type == USB_FORMAT_TYPE_II) if (subs->fmt_type == USB_FORMAT_TYPE_II)
u->packets++; /* for transfer delimiter */ u->packets++; /* for transfer delimiter */
u->urb = usb_alloc_urb(u->packets, GFP_KERNEL); u->urb = usb_alloc_urb(u->packets, GFP_KERNEL);
if (! u->urb) if (!u->urb)
goto out_of_memory; goto out_of_memory;
u->urb->transfer_buffer = u->urb->transfer_buffer =
usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL, usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL,
&u->urb->transfer_dma); &u->urb->transfer_dma);
if (! u->urb->transfer_buffer) if (!u->urb->transfer_buffer)
goto out_of_memory; goto out_of_memory;
u->urb->pipe = subs->datapipe; u->urb->pipe = subs->datapipe;
u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
@ -1155,7 +1156,7 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
/* allocate and initialize sync urbs */ /* allocate and initialize sync urbs */
subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4, subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4,
GFP_KERNEL, &subs->sync_dma); GFP_KERNEL, &subs->sync_dma);
if (! subs->syncbuf) if (!subs->syncbuf)
goto out_of_memory; goto out_of_memory;
for (i = 0; i < SYNC_URBS; i++) { for (i = 0; i < SYNC_URBS; i++) {
struct snd_urb_ctx *u = &subs->syncurb[i]; struct snd_urb_ctx *u = &subs->syncurb[i];
@ -1163,7 +1164,7 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
u->subs = subs; u->subs = subs;
u->packets = 1; u->packets = 1;
u->urb = usb_alloc_urb(1, GFP_KERNEL); u->urb = usb_alloc_urb(1, GFP_KERNEL);
if (! u->urb) if (!u->urb)
goto out_of_memory; goto out_of_memory;
u->urb->transfer_buffer = subs->syncbuf + i * 4; u->urb->transfer_buffer = subs->syncbuf + i * 4;
u->urb->transfer_dma = subs->sync_dma + i * 4; u->urb->transfer_dma = subs->sync_dma + i * 4;
@ -1463,7 +1464,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
rate = params_rate(hw_params); rate = params_rate(hw_params);
channels = params_channels(hw_params); channels = params_channels(hw_params);
fmt = find_format(subs, format, rate, channels); fmt = find_format(subs, format, rate, channels);
if (! fmt) { if (!fmt) {
snd_printd(KERN_DEBUG "cannot set format: format = 0x%x, rate = %d, channels = %d\n", snd_printd(KERN_DEBUG "cannot set format: format = 0x%x, rate = %d, channels = %d\n",
format, rate, channels); format, rate, channels);
return -EINVAL; return -EINVAL;
@ -1584,7 +1585,7 @@ static int hw_check_valid_format(struct snd_pcm_hw_params *params, struct audiof
struct snd_mask *fmts = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_mask *fmts = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
/* check the format */ /* check the format */
if (! snd_mask_test(fmts, fp->format)) { if (!snd_mask_test(fmts, fp->format)) {
hwc_debug(" > check: no supported format %d\n", fp->format); hwc_debug(" > check: no supported format %d\n", fp->format);
return 0; return 0;
} }
@ -1620,7 +1621,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params,
list_for_each(p, &subs->fmt_list) { list_for_each(p, &subs->fmt_list) {
struct audioformat *fp; struct audioformat *fp;
fp = list_entry(p, struct audioformat, list); fp = list_entry(p, struct audioformat, list);
if (! hw_check_valid_format(params, fp)) if (!hw_check_valid_format(params, fp))
continue; continue;
if (changed++) { if (changed++) {
if (rmin > fp->rate_min) if (rmin > fp->rate_min)
@ -1633,7 +1634,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params,
} }
} }
if (! changed) { if (!changed) {
hwc_debug(" --> get empty\n"); hwc_debug(" --> get empty\n");
it->empty = 1; it->empty = 1;
return -EINVAL; return -EINVAL;
@ -1674,7 +1675,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
list_for_each(p, &subs->fmt_list) { list_for_each(p, &subs->fmt_list) {
struct audioformat *fp; struct audioformat *fp;
fp = list_entry(p, struct audioformat, list); fp = list_entry(p, struct audioformat, list);
if (! hw_check_valid_format(params, fp)) if (!hw_check_valid_format(params, fp))
continue; continue;
if (changed++) { if (changed++) {
if (rmin > fp->channels) if (rmin > fp->channels)
@ -1687,7 +1688,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
} }
} }
if (! changed) { if (!changed) {
hwc_debug(" --> get empty\n"); hwc_debug(" --> get empty\n");
it->empty = 1; it->empty = 1;
return -EINVAL; return -EINVAL;
@ -1727,7 +1728,7 @@ static int hw_rule_format(struct snd_pcm_hw_params *params,
list_for_each(p, &subs->fmt_list) { list_for_each(p, &subs->fmt_list) {
struct audioformat *fp; struct audioformat *fp;
fp = list_entry(p, struct audioformat, list); fp = list_entry(p, struct audioformat, list);
if (! hw_check_valid_format(params, fp)) if (!hw_check_valid_format(params, fp))
continue; continue;
fbits |= (1ULL << fp->format); fbits |= (1ULL << fp->format);
} }
@ -1736,7 +1737,7 @@ static int hw_rule_format(struct snd_pcm_hw_params *params,
oldbits[1] = fmt->bits[1]; oldbits[1] = fmt->bits[1];
fmt->bits[0] &= (u32)fbits; fmt->bits[0] &= (u32)fbits;
fmt->bits[1] &= (u32)(fbits >> 32); fmt->bits[1] &= (u32)(fbits >> 32);
if (! fmt->bits[0] && ! fmt->bits[1]) { if (!fmt->bits[0] && !fmt->bits[1]) {
hwc_debug(" --> get empty\n"); hwc_debug(" --> get empty\n");
return -EINVAL; return -EINVAL;
} }
@ -2227,7 +2228,7 @@ static void proc_pcm_format_add(struct snd_usb_stream *stream)
struct snd_card *card = stream->chip->card; struct snd_card *card = stream->chip->card;
sprintf(name, "stream%d", stream->pcm_index); sprintf(name, "stream%d", stream->pcm_index);
if (! snd_card_proc_new(card, name, &entry)) if (!snd_card_proc_new(card, name, &entry))
snd_info_set_text_ops(entry, stream, proc_pcm_format_read); snd_info_set_text_ops(entry, stream, proc_pcm_format_read);
} }
@ -2283,7 +2284,7 @@ static void free_substream(struct snd_usb_substream *subs)
{ {
struct list_head *p, *n; struct list_head *p, *n;
if (! subs->num_formats) if (!subs->num_formats)
return; /* not initialized */ return; /* not initialized */
list_for_each_safe(p, n, &subs->fmt_list) { list_for_each_safe(p, n, &subs->fmt_list) {
struct audioformat *fp = list_entry(p, struct audioformat, list); struct audioformat *fp = list_entry(p, struct audioformat, list);
@ -2333,7 +2334,7 @@ static int add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct aud
if (as->fmt_type != fp->fmt_type) if (as->fmt_type != fp->fmt_type)
continue; continue;
subs = &as->substream[stream]; subs = &as->substream[stream];
if (! subs->endpoint) if (!subs->endpoint)
continue; continue;
if (subs->endpoint == fp->endpoint) { if (subs->endpoint == fp->endpoint) {
list_add_tail(&fp->list, &subs->fmt_list); list_add_tail(&fp->list, &subs->fmt_list);
@ -2359,7 +2360,7 @@ static int add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct aud
/* create a new pcm */ /* create a new pcm */
as = kzalloc(sizeof(*as), GFP_KERNEL); as = kzalloc(sizeof(*as), GFP_KERNEL);
if (! as) if (!as)
return -ENOMEM; return -ENOMEM;
as->pcm_index = chip->pcm_devs; as->pcm_index = chip->pcm_devs;
as->chip = chip; as->chip = chip;
@ -3392,14 +3393,14 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip,
static void proc_audio_usbbus_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) static void proc_audio_usbbus_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{ {
struct snd_usb_audio *chip = entry->private_data; struct snd_usb_audio *chip = entry->private_data;
if (! chip->shutdown) if (!chip->shutdown)
snd_iprintf(buffer, "%03d/%03d\n", chip->dev->bus->busnum, chip->dev->devnum); snd_iprintf(buffer, "%03d/%03d\n", chip->dev->bus->busnum, chip->dev->devnum);
} }
static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{ {
struct snd_usb_audio *chip = entry->private_data; struct snd_usb_audio *chip = entry->private_data;
if (! chip->shutdown) if (!chip->shutdown)
snd_iprintf(buffer, "%04x:%04x\n", snd_iprintf(buffer, "%04x:%04x\n",
USB_ID_VENDOR(chip->usb_id), USB_ID_VENDOR(chip->usb_id),
USB_ID_PRODUCT(chip->usb_id)); USB_ID_PRODUCT(chip->usb_id));
@ -3408,9 +3409,9 @@ static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_
static void snd_usb_audio_create_proc(struct snd_usb_audio *chip) static void snd_usb_audio_create_proc(struct snd_usb_audio *chip)
{ {
struct snd_info_entry *entry; struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "usbbus", &entry)) if (!snd_card_proc_new(chip->card, "usbbus", &entry))
snd_info_set_text_ops(entry, chip, proc_audio_usbbus_read); snd_info_set_text_ops(entry, chip, proc_audio_usbbus_read);
if (! snd_card_proc_new(chip->card, "usbid", &entry)) if (!snd_card_proc_new(chip->card, "usbid", &entry))
snd_info_set_text_ops(entry, chip, proc_audio_usbid_read); snd_info_set_text_ops(entry, chip, proc_audio_usbid_read);
} }
@ -3617,8 +3618,8 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
snd_card_set_dev(chip->card, &intf->dev); snd_card_set_dev(chip->card, &intf->dev);
break; break;
} }
if (! chip) { if (!chip) {
snd_printk(KERN_ERR "no available usb audio device\n"); printk(KERN_ERR "no available usb audio device\n");
goto __error; goto __error;
} }
} }