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

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

@@ -72 +72 @@
         }
 
-        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(*trident), &card);
         if (err < 0)
                 return err;
+        trident = card->private_data;
 
         err = snd_trident_create(card, pci,
                                  pcm_channels[dev],
                                  ((pci->vendor << 16) | pci->device) == TRIDENT_DEVICE_ID_SI7018 ? 1 : 2,
-                                 wavetable_size[dev],
-                                 &trident);
-        if (err < 0) {
-                snd_card_free(card);
+                                 wavetable_size[dev]);
+        if (err < 0)
                 return err;
-        }
-        card->private_data = trident;
 
         switch (trident->device) {
@@ -112 +109 @@
 
         err = snd_trident_pcm(trident, pcm_dev++);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         switch (trident->device) {
         case TRIDENT_DEVICE_ID_DX:
         case TRIDENT_DEVICE_ID_NX:
                 err = snd_trident_foldback_pcm(trident, pcm_dev++);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
                 break;
         }
         if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device == TRIDENT_DEVICE_ID_SI7018) {
                 err = snd_trident_spdif_pcm(trident, pcm_dev++);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
         }
         if (trident->device != TRIDENT_DEVICE_ID_SI7018) {
@@ -139 +130 @@
                                           MPU401_INFO_IRQ_HOOK,
                                           -1, &trident->rmidi);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
         }
 
@@ -148 +137 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
-}
-
-static void snd_trident_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
 }
 
@@ -166 +148 @@
         .id_table = snd_trident_ids,
         .probe = snd_trident_probe,
-        .remove = snd_trident_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {