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

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

@@ -1272 +1272 @@
 #endif /* IS_REACHABLE(CONFIG_GAMEPORT) */
 
-static int snd_cs4281_free(struct cs4281 *chip)
-{
+static void snd_cs4281_free(struct snd_card *card)
+{
+        struct cs4281 *chip = card->private_data;
+
         snd_cs4281_free_gameport(chip);
 
@@ -1282 +1284 @@
         /* Sound System Power Management - Turn Everything OFF */
         snd_cs4281_pokeBA0(chip, BA0_SSPM, 0);
-        /* PCI interface - D3 state */
-        pci_set_power_state(chip->pci, PCI_D3hot);
-
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
-        iounmap(chip->ba0);
-        iounmap(chip->ba1);
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-
-        kfree(chip);
-        return 0;
-}
-
-static int snd_cs4281_dev_free(struct snd_device *device)
-{
-        struct cs4281 *chip = device->device_data;
-        return snd_cs4281_free(chip);
 }
 
@@ -1306 +1290 @@
 static int snd_cs4281_create(struct snd_card *card,
                              struct pci_dev *pci,
-                             struct cs4281 **rchip,
                              int dual_codec)
 {
-        struct cs4281 *chip;
-        unsigned int tmp;
+        struct cs4281 *chip = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_cs4281_dev_free,
-        };
-
-        *rchip = NULL;
-        err = pci_enable_device(pci);
+
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
         spin_lock_init(&chip->reg_lock);
         chip->card = card;
@@ -1336 +1309 @@
         chip->dual_codec = dual_codec;
 
+#ifndef TARGET_OS2
+        err = pcim_iomap_regions(pci, 0x03, "CS4281"); /* 2 BARs */
+        if (err < 0)
+                return err;
+#else
         err = pci_request_regions(pci, "CS4281");
         if (err < 0) {
@@ -1342 +1320 @@
                 return err;
         }
+#endif
         chip->ba0_addr = pci_resource_start(pci, 0);
         chip->ba1_addr = pci_resource_start(pci, 1);
 
+#ifndef TARGET_OS2
+        chip->ba0 = pcim_iomap_table(pci)[0];
+        chip->ba1 = pcim_iomap_table(pci)[1];
+#else
         chip->ba0 = pci_ioremap_bar(pci, 0);
         chip->ba1 = pci_ioremap_bar(pci, 1);
-        if (!chip->ba0 || !chip->ba1) {
-                snd_cs4281_free(chip);
-                return -ENOMEM;
-        }
-        
-        if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
+#endif
+        if (devm_request_irq(&pci->dev, pci->irq, snd_cs4281_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_cs4281_free(chip);
                 return -ENOMEM;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
-
-        tmp = snd_cs4281_chip_init(chip);
-        if (tmp) {
-                snd_cs4281_free(chip);
-                return tmp;
-        }
-
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_cs4281_free(chip);
+        card->private_free = snd_cs4281_free;
+
+        err = snd_cs4281_chip_init(chip);
+        if (err)
                 return err;
-        }
 
         snd_cs4281_proc_init(chip);
-
-        *rchip = chip;
         return 0;
 }
@@ -1875 +1844 @@
 }
 
-static int snd_cs4281_probe(struct pci_dev *pci,
-                            const struct pci_device_id *pci_id)
+static int __snd_cs4281_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -1891 +1860 @@
         }
 
-        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;
-
-        err = snd_cs4281_create(card, pci, &chip, dual_codec[dev]);
-        if (err < 0) {
-                snd_card_free(card);
+        chip = card->private_data;
+
+        err = snd_cs4281_create(card, pci, dual_codec[dev]);
+        if (err < 0)
                 return err;
-        }
-        card->private_data = chip;
 
         err = snd_cs4281_mixer(chip);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_cs4281_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_cs4281_midi(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &opl3);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         opl3->private_data = chip;
         opl3->command = snd_cs4281_opl3_command;
         snd_opl3_init(opl3);
         err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         snd_cs4281_create_gameport(chip);
         strcpy(card->driver, "CS4281");
@@ -1940 +1897 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         pci_set_drvdata(pci, card);
@@ -1950 +1905 @@
 }
 
-static void snd_cs4281_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_cs4281_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_cs4281_probe(pci, pci_id));
 }
 
@@ -2058 +2014 @@
         .id_table = snd_cs4281_ids,
         .probe = snd_cs4281_probe,
-        .remove = snd_cs4281_remove,
         .driver = {
                 .pm = CS4281_PM_OPS,