Changeset 717 for GPL/trunk/alsa-kernel/pci/ens1370.c

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ens1370.c (modified) (12 diffs)

GPL/trunk/alsa-kernel/pci/ens1370.c

@@ -418 +418 @@
 
 #ifdef CHIP1370
-        struct snd_dma_buffer dma_bug;
+        struct snd_dma_buffer *dma_bug;
 #endif
 
@@ -1876 +1876 @@
  */
 
-static int snd_ensoniq_free(struct ensoniq *ensoniq)
-{
+static void snd_ensoniq_free(struct snd_card *card)
+{
+        struct ensoniq *ensoniq = card->private_data;
+
         snd_ensoniq_free_gameport(ensoniq);
-        if (ensoniq->irq < 0)
-                goto __hw_end;
 #ifdef CHIP1370
         outl(ES_1370_SERR_DISABLE, ES_REG(ensoniq, CONTROL));   /* switch everything off */
@@ -1888 +1888 @@
         outl(0, ES_REG(ensoniq, SERIAL));       /* clear serial interface */
 #endif
-        pci_set_power_state(ensoniq->pci, PCI_D3hot);
-      __hw_end:
-#ifdef CHIP1370
-        if (ensoniq->dma_bug.area)
-                snd_dma_free_pages(&ensoniq->dma_bug);
-#endif
-        if (ensoniq->irq >= 0)
-                free_irq(ensoniq->irq, ensoniq);
-        pci_release_regions(ensoniq->pci);
-        pci_disable_device(ensoniq->pci);
-        kfree(ensoniq);
-        return 0;
-}
-
-static int snd_ensoniq_dev_free(struct snd_device *device)
-{
-        struct ensoniq *ensoniq = device->device_data;
-        return snd_ensoniq_free(ensoniq);
 }
 
@@ -1939 +1921 @@
         outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
         outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));
-        outl(ensoniq->dma_bug.addr, ES_REG(ensoniq, PHANTOM_FRAME));
+        outl(ensoniq->dma_bug->addr, ES_REG(ensoniq, PHANTOM_FRAME));
         outl(0, ES_REG(ensoniq, PHANTOM_COUNT));
 #else
@@ -2036 +2018 @@
 
 static int snd_ensoniq_create(struct snd_card *card,
-                              struct pci_dev *pci,
-                              struct ensoniq **rensoniq)
-{
-        struct ensoniq *ensoniq;
+                              struct pci_dev *pci)
+{
+        struct ensoniq *ensoniq = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_ensoniq_dev_free,
-        };
-
-        *rensoniq = NULL;
-        err = pci_enable_device(pci);
+
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-        ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL);
-        if (ensoniq == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
         spin_lock_init(&ensoniq->reg_lock);
         mutex_init(&ensoniq->src_mutex);
@@ -2060 +2032 @@
         ensoniq->irq = -1;
         err = pci_request_regions(pci, "Ensoniq AudioPCI");
-        if (err < 0) {
-                kfree(ensoniq);
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         ensoniq->port = pci_resource_start(pci, 0);
+#ifndef TARGET_OS2
+        if (devm_request_irq(&pci->dev, pci->irq, snd_audiopci_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, ensoniq)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
+                return -EBUSY;
+        }
+#else
         if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
                         KBUILD_MODNAME, ensoniq)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_ensoniq_free(ensoniq);
+                snd_ensoniq_free(card);
                 return -EBUSY;
         }
+#endif
         ensoniq->irq = pci->irq;
         card->sync_irq = ensoniq->irq;
 #ifdef CHIP1370
-        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
-                                16, &ensoniq->dma_bug) < 0) {
-                dev_err(card->dev, "unable to allocate space for phantom area - dma_bug\n");
-                snd_ensoniq_free(ensoniq);
-                return -EBUSY;
-        }
+        ensoniq->dma_bug =
+                snd_devm_alloc_pages(&pci->dev, SNDRV_DMA_TYPE_DEV, 16);
+        if (!ensoniq->dma_bug)
+                return -ENOMEM;
 #endif
         pci_set_master(pci);
@@ -2107 +2082 @@
 #endif
 
+        card->private_free = snd_ensoniq_free;
         snd_ensoniq_chip_init(ensoniq);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops);
-        if (err < 0) {
-                snd_ensoniq_free(ensoniq);
-                return err;
-        }
-
         snd_ensoniq_proc_init(ensoniq);
-
-        *rensoniq = ensoniq;
         return 0;
 }
@@ -2353 +2321 @@
 }
 
-static int snd_audiopci_probe(struct pci_dev *pci,
-                              const struct pci_device_id *pci_id)
+static int __snd_audiopci_probe(struct pci_dev *pci,
+                                const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -2368 +2336 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*ensoniq), &card);
         if (err < 0)
                 return err;
-
-        err = snd_ensoniq_create(card, pci, &ensoniq);
-        if (err < 0) {
-                snd_card_free(card);
+        ensoniq = card->private_data;
+
+        err = snd_ensoniq_create(card, pci);
+        if (err < 0)
                 return err;
-        }
-        card->private_data = ensoniq;
 
 #ifdef CHIP1370
         err = snd_ensoniq_1370_mixer(ensoniq);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 #endif
 #ifdef CHIP1371
         err = snd_ensoniq_1371_mixer(ensoniq, spdif[dev], lineio[dev]);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 #endif
         err = snd_ensoniq_pcm(ensoniq, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_ensoniq_pcm2(ensoniq, 1);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_ensoniq_midi(ensoniq, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         snd_ensoniq_create_gameport(ensoniq, dev);
@@ -2422 +2378 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         pci_set_drvdata(pci, card);
@@ -2432 +2386 @@
 }
 
-static void snd_audiopci_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_audiopci_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_audiopci_probe(pci, pci_id));
 }
 
@@ -2441 +2396 @@
         .id_table = snd_audiopci_ids,
         .probe = snd_audiopci_probe,
-        .remove = snd_audiopci_remove,
         .driver = {
                 .pm = SND_ENSONIQ_PM_OPS,