aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-09 11:17:20 -0400
committerTakashi Iwai <tiwai@suse.de>2014-09-15 09:52:03 -0400
commitdb0a5214b8d6cc7a90ce3336d24a85b90cbb4e67 (patch)
treefdfcfaee149e83613d9854a763bbe3fe95f60292 /sound/pci
parente7e69265b6269763799a5de9c263fbbce32cd3a3 (diff)
ALSA: vx: Use nonatomic PCM ops
Rewrite VXpocket and VX222 drivers to use the new PCM nonatomic ops. The former irq tasklet is replaced with a threaded irq handler, and the tasklet for the PCM delayed start is simply merged into the normal PCM trigger, as well as the replacement of spinlock with mutex. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/vx222/vx222.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 3dc4732142ee..c5a25e39e3a8 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -168,8 +168,9 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci,
168 for (i = 0; i < 2; i++) 168 for (i = 0; i < 2; i++)
169 vx->port[i] = pci_resource_start(pci, i + 1); 169 vx->port[i] = pci_resource_start(pci, i + 1);
170 170
171 if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED, 171 if (request_threaded_irq(pci->irq, snd_vx_irq_handler,
172 KBUILD_MODNAME, chip)) { 172 snd_vx_threaded_irq_handler, IRQF_SHARED,
173 KBUILD_MODNAME, chip)) {
173 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); 174 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
174 snd_vx222_free(chip); 175 snd_vx222_free(chip);
175 return -EBUSY; 176 return -EBUSY;