Skip to content

L
linux
Commit 966f4163 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] em28xx-audio: split URB initialization code 

The URB calculus code may eventually be moved to some other
place, like at pcm open, if it ends by needing more setups, like
working with different bit rates, or different audio latency.

So, move it into a separate routine. That also makes the code
more readable.

No functional changes.
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 34906633
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 69 deletions
drivers/media/usb/em28xx/em28xx-audio.c
View file @ 966f4163
...@@ -681,75 +681,14 @@ static int em28xx_audio_ep_packet_size(struct usb_device *udev, ...@@ -681,75 +681,14 @@ static int em28xx_audio_ep_packet_size(struct usb_device *udev,
return size & 0x7ff; return size & 0x7ff;
} }
static int em28xx_audio_init(struct em28xx *dev) static int em28xx_audio_urb_init(struct em28xx *dev)
{ {
struct em28xx_audio *adev = &dev->adev;
struct snd_pcm *pcm;
struct snd_card *card;
struct usb_interface *intf; struct usb_interface *intf;
struct usb_endpoint_descriptor *e, *ep = NULL; struct usb_endpoint_descriptor *e, *ep = NULL;
static int devnr; int i, ep_size, interval, num_urb, npackets;
int err, i, ep_size, interval, num_urb, npackets;
int urb_size, bytes_per_transfer; int urb_size, bytes_per_transfer;
u8 alt; u8 alt;
if (!dev->has_alsa_audio || dev->audio_ifnum < 0) {
/* This device does not support the extension (in this case
the device is expecting the snd-usb-audio module or
doesn't have analog audio support at all) */
return 0;
}
em28xx_info("Binding audio extension\n");
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
"Rechberger\n");
printk(KERN_INFO
"em28xx-audio.c: Copyright (C) 2007-2014 Mauro Carvalho Chehab\n");
err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
&card);
if (err < 0)
return err;
spin_lock_init(&adev->slock);
adev->sndcard = card;
adev->udev = dev->udev;
err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
if (err < 0) {
snd_card_free(card);
return err;
}
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_em28xx_pcm_capture);
pcm->info_flags = 0;
pcm->private_data = dev;
strcpy(pcm->name, "Empia 28xx Capture");
snd_card_set_dev(card, &dev->udev->dev);
strcpy(card->driver, "Em28xx-Audio");
strcpy(card->shortname, "Em28xx Audio");
strcpy(card->longname, "Empia Em28xx Audio");
INIT_WORK(&dev->wq_trigger, audio_trigger);
if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
em28xx_cvol_new(card, dev, "Video", AC97_VIDEO);
em28xx_cvol_new(card, dev, "Line In", AC97_LINE);
em28xx_cvol_new(card, dev, "Phone", AC97_PHONE);
em28xx_cvol_new(card, dev, "Microphone", AC97_MIC);
em28xx_cvol_new(card, dev, "CD", AC97_CD);
em28xx_cvol_new(card, dev, "AUX", AC97_AUX);
em28xx_cvol_new(card, dev, "PCM", AC97_PCM);
em28xx_cvol_new(card, dev, "Master", AC97_MASTER);
em28xx_cvol_new(card, dev, "Line", AC97_HEADPHONE);
em28xx_cvol_new(card, dev, "Mono", AC97_MASTER_MONO);
em28xx_cvol_new(card, dev, "LFE", AC97_CENTER_LFE_MASTER);
em28xx_cvol_new(card, dev, "Surround", AC97_SURROUND_MASTER);
}
if (dev->audio_ifnum) if (dev->audio_ifnum)
alt = 1; alt = 1;
else else
...@@ -760,7 +699,6 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -760,7 +699,6 @@ static int em28xx_audio_init(struct em28xx *dev)
if (intf->num_altsetting <= alt) { if (intf->num_altsetting <= alt) {
em28xx_errdev("alt %d doesn't exist on interface %d\n", em28xx_errdev("alt %d doesn't exist on interface %d\n",
dev->audio_ifnum, alt); dev->audio_ifnum, alt);
snd_card_free(card);
return -ENODEV; return -ENODEV;
} }
...@@ -776,7 +714,6 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -776,7 +714,6 @@ static int em28xx_audio_init(struct em28xx *dev)
if (!ep) { if (!ep) {
em28xx_errdev("Couldn't find an audio endpoint"); em28xx_errdev("Couldn't find an audio endpoint");
snd_card_free(card);
return -ENODEV; return -ENODEV;
} }
...@@ -833,13 +770,11 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -833,13 +770,11 @@ static int em28xx_audio_init(struct em28xx *dev)
sizeof(*dev->adev.transfer_buffer), sizeof(*dev->adev.transfer_buffer),
GFP_ATOMIC); GFP_ATOMIC);
if (!dev->adev.transfer_buffer) { if (!dev->adev.transfer_buffer) {
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
dev->adev.urb = kcalloc(num_urb, sizeof(*dev->adev.urb), GFP_ATOMIC); dev->adev.urb = kcalloc(num_urb, sizeof(*dev->adev.urb), GFP_ATOMIC);
if (!dev->adev.urb) { if (!dev->adev.urb) {
snd_card_free(card);
kfree(dev->adev.transfer_buffer); kfree(dev->adev.transfer_buffer);
return -ENOMEM; return -ENOMEM;
} }
...@@ -855,7 +790,6 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -855,7 +790,6 @@ static int em28xx_audio_init(struct em28xx *dev)
if (!urb) { if (!urb) {
em28xx_errdev("usb_alloc_urb failed!\n"); em28xx_errdev("usb_alloc_urb failed!\n");
em28xx_audio_free_urb(dev); em28xx_audio_free_urb(dev);
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
dev->adev.urb[i] = urb; dev->adev.urb[i] = urb;
...@@ -865,7 +799,6 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -865,7 +799,6 @@ static int em28xx_audio_init(struct em28xx *dev)
if (!buf) { if (!buf) {
em28xx_errdev("usb_alloc_coherent failed!\n"); em28xx_errdev("usb_alloc_coherent failed!\n");
em28xx_audio_free_urb(dev); em28xx_audio_free_urb(dev);
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
dev->adev.transfer_buffer[i] = buf; dev->adev.transfer_buffer[i] = buf;
...@@ -886,6 +819,80 @@ static int em28xx_audio_init(struct em28xx *dev) ...@@ -886,6 +819,80 @@ static int em28xx_audio_init(struct em28xx *dev)
} }
} }
return 0;
}
static int em28xx_audio_init(struct em28xx *dev)
{
struct em28xx_audio *adev = &dev->adev;
struct snd_pcm *pcm;
struct snd_card *card;
static int devnr;
int err;
if (!dev->has_alsa_audio || dev->audio_ifnum < 0) {
/* This device does not support the extension (in this case
the device is expecting the snd-usb-audio module or
doesn't have analog audio support at all) */
return 0;
}
em28xx_info("Binding audio extension\n");
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
"Rechberger\n");
printk(KERN_INFO
"em28xx-audio.c: Copyright (C) 2007-2014 Mauro Carvalho Chehab\n");
err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
&card);
if (err < 0)
return err;
spin_lock_init(&adev->slock);
adev->sndcard = card;
adev->udev = dev->udev;
err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
if (err < 0) {
snd_card_free(card);
return err;
}
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_em28xx_pcm_capture);
pcm->info_flags = 0;
pcm->private_data = dev;
strcpy(pcm->name, "Empia 28xx Capture");
snd_card_set_dev(card, &dev->udev->dev);
strcpy(card->driver, "Em28xx-Audio");
strcpy(card->shortname, "Em28xx Audio");
strcpy(card->longname, "Empia Em28xx Audio");
INIT_WORK(&dev->wq_trigger, audio_trigger);
if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
em28xx_cvol_new(card, dev, "Video", AC97_VIDEO);
em28xx_cvol_new(card, dev, "Line In", AC97_LINE);
em28xx_cvol_new(card, dev, "Phone", AC97_PHONE);
em28xx_cvol_new(card, dev, "Microphone", AC97_MIC);
em28xx_cvol_new(card, dev, "CD", AC97_CD);
em28xx_cvol_new(card, dev, "AUX", AC97_AUX);
em28xx_cvol_new(card, dev, "PCM", AC97_PCM);
em28xx_cvol_new(card, dev, "Master", AC97_MASTER);
em28xx_cvol_new(card, dev, "Line", AC97_HEADPHONE);
em28xx_cvol_new(card, dev, "Mono", AC97_MASTER_MONO);
em28xx_cvol_new(card, dev, "LFE", AC97_CENTER_LFE_MASTER);
em28xx_cvol_new(card, dev, "Surround", AC97_SURROUND_MASTER);
}
err = em28xx_audio_urb_init(dev);
if (err) {
snd_card_free(card);
return -ENODEV;
}
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) { if (err < 0) {
em28xx_audio_free_urb(dev); em28xx_audio_free_urb(dev);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7