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

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

@@ -114 +114 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-        if (err < 0)
-                return err;
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*emu), &card);
+        if (err < 0)
+                return err;
+        emu = card->private_data;
+
         if (max_buffer_size[dev] < 32)
                 max_buffer_size[dev] = 32;
@@ -124 +126 @@
         err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],
                                  (long)max_buffer_size[dev] * 1024 * 1024,
-                                 enable_ir[dev], subsystem[dev],
-                                 &emu);
-        if (err < 0)
-                goto error;
-        card->private_data = emu;
+                                 enable_ir[dev], subsystem[dev]);
+        if (err < 0)
+                return err;
         emu->delay_pcm_irq = delay_pcm_irq[dev] & 0x1f;
         err = snd_emu10k1_pcm(emu, 0);
         if (err < 0)
-                goto error;
+                return err;
         err = snd_emu10k1_pcm_mic(emu, 1);
         if (err < 0)
-                goto error;
+                return err;
         err = snd_emu10k1_pcm_efx(emu, 2);
         if (err < 0)
-                goto error;
+                return err;
         /* This stores the periods table. */
         if (emu->card_capabilities->ca0151_chip) { /* P16V */   
-                err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
-                                          1024, &emu->p16v_buffer);
-                if (err < 0)
-                        goto error;
-        }
-
+                emu->p16v_buffer =
+                        snd_devm_alloc_pages(&pci->dev, SNDRV_DMA_TYPE_DEV, 1024);
+                if (!emu->p16v_buffer)
+                        return -ENOMEM;
+        }
         err = snd_emu10k1_mixer(emu, 0, 3);
         if (err < 0)
-                goto error;
+                return err;
         
         err = snd_emu10k1_timer(emu, 0);
         if (err < 0)
-                goto error;
+                return err;
 
         err = snd_emu10k1_pcm_multi(emu, 3);
         if (err < 0)
-                goto error;
+                return err;
         if (emu->card_capabilities->ca0151_chip) { /* P16V */
                 err = snd_p16v_pcm(emu, 4);
                 if (err < 0)
-                        goto error;
+                        return err;
         }
         if (emu->audigy) {
                 err = snd_emu10k1_audigy_midi(emu);
                 if (err < 0)
-                        goto error;
+                        return err;
         } else {
                 err = snd_emu10k1_midi(emu);
                 if (err < 0)
-                        goto error;
+                        return err;
         }
         err = snd_emu10k1_fx8010_new(emu, 0);
         if (err < 0)
-                goto error;
+                return err;
 #ifdef ENABLE_SYNTH
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
@@ -202 +201 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto error;
+                return err;
 
         if (emu->card_capabilities->emu_model)
@@ -210 +209 @@
         dev++;
         return 0;
-
- error:
-        snd_card_free(card);
-        return err;
 }
-
-static void snd_card_emu10k1_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
-}
-
 
 #ifdef CONFIG_PM_SLEEP
@@ -278 +267 @@
         .id_table = snd_emu10k1_ids,
         .probe = snd_card_emu10k1_probe,
-        .remove = snd_card_emu10k1_remove,
         .driver = {
                 .pm = SND_EMU10K1_PM_OPS,