Changeset 717 for GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.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/emu10k1/emu10k1x.c (modified) (15 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -220 +220 @@
 
         unsigned long port;
-        struct resource *res_port;
         int irq;
 
@@ -237 +236 @@
         u32 spdif_bits[3]; // SPDIF out setup
 
-        struct snd_dma_buffer dma_buffer;
+        struct snd_dma_buffer *dma_buffer;
 
         struct emu10k1x_midi midi;
@@ -446 +445 @@
         struct emu10k1x_pcm *epcm = runtime->private_data;
         int voice = epcm->voice->number;
-        u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice);
+        u32 *table_base = (u32 *)(emu->dma_buffer->area+1024*voice);
         u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
         int i;
@@ -455 +454 @@
         }
 
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu->dma_buffer.addr+1024*voice);
+        snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu->dma_buffer->addr+1024*voice);
         snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_SIZE, voice, (runtime->periods - 1) << 19);
         snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_PTR, voice, 0);
@@ -741 +740 @@
 }
 
-static int snd_emu10k1x_free(struct emu10k1x *chip)
-{
+static void snd_emu10k1x_free(struct snd_card *card)
+{
+        struct emu10k1x *chip = card->private_data;
+
         snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0);
         // disable interrupts
@@ -748 +749 @@
         // disable audio
         outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG);
-
-        /* release the irq */
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
-
-        // release the i/o port
-        release_and_free_resource(chip->res_port);
-
-        // release the DMA
-        if (chip->dma_buffer.area) {
-                snd_dma_free_pages(&chip->dma_buffer);
-        }
-
-        pci_disable_device(chip->pci);
-
-        // release the data
-        kfree(chip);
-        return 0;
-}
-
-static int snd_emu10k1x_dev_free(struct snd_device *device)
-{
-        struct emu10k1x *chip = device->device_data;
-        return snd_emu10k1x_free(chip);
 }
 
@@ -889 +866 @@
 
 static int snd_emu10k1x_create(struct snd_card *card,
-                               struct pci_dev *pci,
-                               struct emu10k1x **rchip)
-{
-        struct emu10k1x *chip;
+                               struct pci_dev *pci)
+{
+        struct emu10k1x *chip = card->private_data;
         int err;
         int ch;
-        static const struct snd_device_ops ops = {
-                .dev_free = snd_emu10k1x_dev_free,
-        };
-
-        *rchip = NULL;
-
-        err = pci_enable_device(pci);
+
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
@@ -907 +878 @@
         if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev, "error to set 28bit mask DMA\n");
-                pci_disable_device(pci);
                 return -ENXIO;
-        }
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
         }
 
@@ -924 +888 @@
         spin_lock_init(&chip->voice_lock);
   
+        err = pci_request_regions(pci, "EMU10K1X");
+        if (err < 0)
+                return err;
         chip->port = pci_resource_start(pci, 0);
-        chip->res_port = request_region(chip->port, 8, "EMU10K1X");
-        if (!chip->res_port) {
-                dev_err(card->dev, "cannot allocate the port 0x%lx\n",
-                        chip->port);
-                snd_emu10k1x_free(chip);
-                return -EBUSY;
-        }
-
-        if (request_irq(pci->irq, snd_emu10k1x_interrupt,
-                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
+
+        if (devm_request_irq(&pci->dev, pci->irq, snd_emu10k1x_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "cannot grab irq %d\n", pci->irq);
-                snd_emu10k1x_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_emu10k1x_free;
   
-        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
-                                4 * 1024, &chip->dma_buffer) < 0) {
-                snd_emu10k1x_free(chip);
+        chip->dma_buffer = snd_devm_alloc_pages(&pci->dev, SNDRV_DMA_TYPE_DEV,
+                                                4 * 1024);
+        if (!chip->dma_buffer)
                 return -ENOMEM;
-        }
 
         pci_set_master(pci);
@@ -1006 +965 @@
         outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip->port+HCFG);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_emu10k1x_free(chip);
-                return err;
-        }
-        *rchip = chip;
         return 0;
 }
@@ -1546 +1499 @@
 }
 
-static int snd_emu10k1x_probe(struct pci_dev *pci,
-                              const struct pci_device_id *pci_id)
+static int __snd_emu10k1x_probe(struct pci_dev *pci,
+                                const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -1561 +1514 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-        if (err < 0)
-                return err;
-
-        err = snd_emu10k1x_create(card, pci, &chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*chip), &card);
+        if (err < 0)
+                return err;
+        chip = card->private_data;
+
+        err = snd_emu10k1x_create(card, pci);
+        if (err < 0)
+                return err;
 
         err = snd_emu10k1x_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_emu10k1x_pcm(chip, 1);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_emu10k1x_pcm(chip, 2);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
 
         err = snd_emu10k1x_ac97(chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
 
         err = snd_emu10k1x_mixer(chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         
         err = snd_emu10k1x_midi(chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
 
         snd_emu10k1x_proc_init(chip);
@@ -1614 +1554 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
 
         pci_set_drvdata(pci, card);
@@ -1624 +1562 @@
 }
 
-static void snd_emu10k1x_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_emu10k1x_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_emu10k1x_probe(pci, pci_id));
 }
 
@@ -1641 +1580 @@
         .id_table = snd_emu10k1x_ids,
         .probe = snd_emu10k1x_probe,
-        .remove = snd_emu10k1x_remove,
 };