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

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

@@ -74 +74 @@
         }
 
-        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(*chip), &card);
         if (err < 0)
                 return err;
+        chip = card->private_data;
         err = snd_cs46xx_create(card, pci,
-                                external_amp[dev], thinkpad[dev],
-                                &chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                external_amp[dev], thinkpad[dev]);
+        if (err < 0)
+                goto error;
         card->private_data = chip;
         chip->accept_valid = mmap_valid[dev];
         err = snd_cs46xx_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         err = snd_cs46xx_pcm_rear(chip, 1);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
         err = snd_cs46xx_pcm_iec958(chip, 2);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
 #endif
         err = snd_cs46xx_mixer(chip, 2);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         if (chip->nr_ac97_codecs ==2) {
                 err = snd_cs46xx_pcm_center_lfe(chip, 3);
-                if (err < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
+                if (err < 0)
+                        goto error;
         }
 #endif
         err = snd_cs46xx_midi(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
         err = snd_cs46xx_start_dsp(chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
+        if (err < 0)
+                goto error;
 
         snd_cs46xx_gameport(chip);
@@ -141 +124 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                goto error;
 
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
-}
 
-static void snd_card_cs46xx_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+ error:
+        snd_card_free(card);
+        return err;
 }
 
@@ -160 +140 @@
         .id_table = snd_cs46xx_ids,
         .probe = snd_card_cs46xx_probe,
-        .remove = snd_card_cs46xx_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {