Commit 9318dce5 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai

ALSA: snd_usb_caiaq: clean whitespaces

Cosmetic changes only, no code change.
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3218911f
This diff is collapsed.
...@@ -79,7 +79,7 @@ static struct usb_device_id snd_usb_id_table[] = { ...@@ -79,7 +79,7 @@ static struct usb_device_id snd_usb_id_table[] = {
{ {
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
.idVendor = USB_VID_NATIVEINSTRUMENTS, .idVendor = USB_VID_NATIVEINSTRUMENTS,
.idProduct = USB_PID_RIGKONTROL2 .idProduct = USB_PID_RIGKONTROL2
}, },
{ {
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
...@@ -197,7 +197,7 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev, ...@@ -197,7 +197,7 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev,
if (buffer && len > 0) if (buffer && len > 0)
memcpy(dev->ep1_out_buf+1, buffer, len); memcpy(dev->ep1_out_buf+1, buffer, len);
dev->ep1_out_buf[0] = command; dev->ep1_out_buf[0] = command;
return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1), return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1),
dev->ep1_out_buf, len+1, &actual_len, 200); dev->ep1_out_buf, len+1, &actual_len, 200);
...@@ -208,7 +208,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -208,7 +208,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
{ {
int ret; int ret;
char tmp[5]; char tmp[5];
switch (rate) { switch (rate) {
case 44100: tmp[0] = SAMPLERATE_44100; break; case 44100: tmp[0] = SAMPLERATE_44100; break;
case 48000: tmp[0] = SAMPLERATE_48000; break; case 48000: tmp[0] = SAMPLERATE_48000; break;
...@@ -237,12 +237,12 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -237,12 +237,12 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
if (ret) if (ret)
return ret; return ret;
if (!wait_event_timeout(dev->ep1_wait_queue, if (!wait_event_timeout(dev->ep1_wait_queue,
dev->audio_parm_answer >= 0, HZ)) dev->audio_parm_answer >= 0, HZ))
return -EPIPE; return -EPIPE;
if (dev->audio_parm_answer != 1) if (dev->audio_parm_answer != 1)
debug("unable to set the device's audio params\n"); debug("unable to set the device's audio params\n");
else else
dev->bpp = bpp; dev->bpp = bpp;
...@@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, ...@@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
return dev->audio_parm_answer == 1 ? 0 : -EINVAL; return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
} }
int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev, int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
int digital, int analog, int erp) int digital, int analog, int erp)
{ {
char tmp[3] = { digital, analog, erp }; char tmp[3] = { digital, analog, erp };
return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG, return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG,
...@@ -262,7 +262,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -262,7 +262,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
{ {
int ret; int ret;
char val[4]; char val[4];
/* device-specific startup specials */ /* device-specific startup specials */
switch (dev->chip.usb_id) { switch (dev->chip.usb_id) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
...@@ -314,7 +314,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -314,7 +314,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
dev->control_state, 1); dev->control_state, 1);
break; break;
} }
if (dev->spec.num_analog_audio_out + if (dev->spec.num_analog_audio_out +
dev->spec.num_analog_audio_in + dev->spec.num_analog_audio_in +
dev->spec.num_digital_audio_out + dev->spec.num_digital_audio_out +
...@@ -323,7 +323,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) ...@@ -323,7 +323,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
if (ret < 0) if (ret < 0)
log("Unable to set up audio system (ret=%d)\n", ret); log("Unable to set up audio system (ret=%d)\n", ret);
} }
if (dev->spec.num_midi_in + if (dev->spec.num_midi_in +
dev->spec.num_midi_out > 0) { dev->spec.num_midi_out > 0) {
ret = snd_usb_caiaq_midi_init(dev); ret = snd_usb_caiaq_midi_init(dev);
...@@ -363,7 +363,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) ...@@ -363,7 +363,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
if (devnum >= SNDRV_CARDS) if (devnum >= SNDRV_CARDS)
return -ENODEV; return -ENODEV;
err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
sizeof(struct snd_usb_caiaqdev), &card); sizeof(struct snd_usb_caiaqdev), &card);
if (err < 0) if (err < 0)
return err; return err;
...@@ -386,7 +386,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -386,7 +386,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
struct usb_device *usb_dev = dev->chip.dev; struct usb_device *usb_dev = dev->chip.dev;
struct snd_card *card = dev->chip.card; struct snd_card *card = dev->chip.card;
int err, len; int err, len;
if (usb_set_interface(usb_dev, 0, 1) != 0) { if (usb_set_interface(usb_dev, 0, 1) != 0) {
log("can't set alt interface.\n"); log("can't set alt interface.\n");
return -EIO; return -EIO;
...@@ -395,19 +395,19 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -395,19 +395,19 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
usb_init_urb(&dev->ep1_in_urb); usb_init_urb(&dev->ep1_in_urb);
usb_init_urb(&dev->midi_out_urb); usb_init_urb(&dev->midi_out_urb);
usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev, usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev,
usb_rcvbulkpipe(usb_dev, 0x1), usb_rcvbulkpipe(usb_dev, 0x1),
dev->ep1_in_buf, EP1_BUFSIZE, dev->ep1_in_buf, EP1_BUFSIZE,
usb_ep1_command_reply_dispatch, dev); usb_ep1_command_reply_dispatch, dev);
usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev, usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev,
usb_sndbulkpipe(usb_dev, 0x1), usb_sndbulkpipe(usb_dev, 0x1),
dev->midi_out_buf, EP1_BUFSIZE, dev->midi_out_buf, EP1_BUFSIZE,
snd_usb_caiaq_midi_output_done, dev); snd_usb_caiaq_midi_output_done, dev);
init_waitqueue_head(&dev->ep1_wait_queue); init_waitqueue_head(&dev->ep1_wait_queue);
init_waitqueue_head(&dev->prepare_wait_queue); init_waitqueue_head(&dev->prepare_wait_queue);
if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0) if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0)
return -EIO; return -EIO;
...@@ -420,10 +420,10 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -420,10 +420,10 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
usb_string(usb_dev, usb_dev->descriptor.iManufacturer, usb_string(usb_dev, usb_dev->descriptor.iManufacturer,
dev->vendor_name, CAIAQ_USB_STR_LEN); dev->vendor_name, CAIAQ_USB_STR_LEN);
usb_string(usb_dev, usb_dev->descriptor.iProduct, usb_string(usb_dev, usb_dev->descriptor.iProduct,
dev->product_name, CAIAQ_USB_STR_LEN); dev->product_name, CAIAQ_USB_STR_LEN);
usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, usb_string(usb_dev, usb_dev->descriptor.iSerialNumber,
dev->serial, CAIAQ_USB_STR_LEN); dev->serial, CAIAQ_USB_STR_LEN);
...@@ -431,7 +431,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -431,7 +431,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
c = strchr(dev->serial, ' '); c = strchr(dev->serial, ' ');
if (c) if (c)
*c = '\0'; *c = '\0';
strcpy(card->driver, MODNAME); strcpy(card->driver, MODNAME);
strcpy(card->shortname, dev->product_name); strcpy(card->shortname, dev->product_name);
...@@ -449,18 +449,18 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -449,18 +449,18 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
return 0; return 0;
} }
static int __devinit snd_probe(struct usb_interface *intf, static int __devinit snd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
int ret; int ret;
struct snd_card *card; struct snd_card *card;
struct usb_device *device = interface_to_usbdev(intf); struct usb_device *device = interface_to_usbdev(intf);
ret = create_card(device, &card); ret = create_card(device, &card);
if (ret < 0) if (ret < 0)
return ret; return ret;
usb_set_intfdata(intf, card); usb_set_intfdata(intf, card);
ret = init_card(caiaqdev(card)); ret = init_card(caiaqdev(card));
if (ret < 0) { if (ret < 0) {
...@@ -468,7 +468,7 @@ static int __devinit snd_probe(struct usb_interface *intf, ...@@ -468,7 +468,7 @@ static int __devinit snd_probe(struct usb_interface *intf,
snd_card_free(card); snd_card_free(card);
return ret; return ret;
} }
return 0; return 0;
} }
...@@ -489,10 +489,10 @@ static void snd_disconnect(struct usb_interface *intf) ...@@ -489,10 +489,10 @@ static void snd_disconnect(struct usb_interface *intf)
snd_usb_caiaq_input_free(dev); snd_usb_caiaq_input_free(dev);
#endif #endif
snd_usb_caiaq_audio_free(dev); snd_usb_caiaq_audio_free(dev);
usb_kill_urb(&dev->ep1_in_urb); usb_kill_urb(&dev->ep1_in_urb);
usb_kill_urb(&dev->midi_out_urb); usb_kill_urb(&dev->midi_out_urb);
snd_card_free(card); snd_card_free(card);
usb_reset_device(interface_to_usbdev(intf)); usb_reset_device(interface_to_usbdev(intf));
} }
......
...@@ -40,7 +40,7 @@ static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *subst ...@@ -40,7 +40,7 @@ static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *subst
if (!dev) if (!dev)
return; return;
dev->midi_receive_substream = up ? substream : NULL; dev->midi_receive_substream = up ? substream : NULL;
} }
...@@ -64,18 +64,18 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -64,18 +64,18 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
struct snd_rawmidi_substream *substream) struct snd_rawmidi_substream *substream)
{ {
int len, ret; int len, ret;
dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE; dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE;
dev->midi_out_buf[1] = 0; /* port */ dev->midi_out_buf[1] = 0; /* port */
len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3, len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3,
EP1_BUFSIZE - 3); EP1_BUFSIZE - 3);
if (len <= 0) if (len <= 0)
return; return;
dev->midi_out_buf[2] = len; dev->midi_out_buf[2] = len;
dev->midi_out_urb.transfer_buffer_length = len+3; dev->midi_out_urb.transfer_buffer_length = len+3;
ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC); ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC);
if (ret < 0) if (ret < 0)
log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed," log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed,"
...@@ -88,7 +88,7 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -88,7 +88,7 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
struct snd_usb_caiaqdev *dev = substream->rmidi->private_data; struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
if (up) { if (up) {
dev->midi_out_substream = substream; dev->midi_out_substream = substream;
if (!dev->midi_out_active) if (!dev->midi_out_active)
...@@ -113,12 +113,12 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input = ...@@ -113,12 +113,12 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input =
.trigger = snd_usb_caiaq_midi_input_trigger, .trigger = snd_usb_caiaq_midi_input_trigger,
}; };
void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev, void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev,
int port, const char *buf, int len) int port, const char *buf, int len)
{ {
if (!dev->midi_receive_substream) if (!dev->midi_receive_substream)
return; return;
snd_rawmidi_receive(dev->midi_receive_substream, buf, len); snd_rawmidi_receive(dev->midi_receive_substream, buf, len);
} }
...@@ -142,16 +142,16 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) ...@@ -142,16 +142,16 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
if (device->spec.num_midi_out > 0) { if (device->spec.num_midi_out > 0) {
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
&snd_usb_caiaq_midi_output); &snd_usb_caiaq_midi_output);
} }
if (device->spec.num_midi_in > 0) { if (device->spec.num_midi_in > 0) {
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
&snd_usb_caiaq_midi_input); &snd_usb_caiaq_midi_input);
} }
device->rmidi = rmidi; device->rmidi = rmidi;
return 0; return 0;
...@@ -160,7 +160,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) ...@@ -160,7 +160,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
void snd_usb_caiaq_midi_output_done(struct urb* urb) void snd_usb_caiaq_midi_output_done(struct urb* urb)
{ {
struct snd_usb_caiaqdev *dev = urb->context; struct snd_usb_caiaqdev *dev = urb->context;
dev->midi_out_active = 0; dev->midi_out_active = 0;
if (urb->status != 0) if (urb->status != 0)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment