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

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

@@ -1557 +1557 @@
 #endif /* SUPPORT_JOYSTICK */
 
-static int snd_es1938_free(struct es1938 *chip)
-{
+static void snd_es1938_free(struct snd_card *card)
+{
+        struct es1938 *chip = card->private_data;
+
         /* disable irqs */
         outb(0x00, SLIO_REG(chip, IRQCONTROL));
@@ -1568 +1570 @@
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_es1938_dev_free(struct snd_device *device)
-{
-        struct es1938 *chip = device->device_data;
-        return snd_es1938_free(chip);
 }
 
 static int snd_es1938_create(struct snd_card *card,
-                             struct pci_dev *pci,
-                             struct es1938 **rchip)
-{
-        struct es1938 *chip;
+                             struct pci_dev *pci)
+{
+        struct es1938 *chip = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_es1938_dev_free,
-        };
-
-        *rchip = NULL;
 
         /* enable PCI device */
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
@@ -1600 +1586 @@
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n");
-                pci_disable_device(pci);
                 return -ENXIO;
         }
 
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
         spin_lock_init(&chip->reg_lock);
         spin_lock_init(&chip->mixer_lock);
@@ -1615 +1595 @@
         chip->irq = -1;
         err = pci_request_regions(pci, "ESS Solo-1");
-        if (err < 0) {
-                kfree(chip);
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         chip->io_port = pci_resource_start(pci, 0);
         chip->sb_port = pci_resource_start(pci, 1);
@@ -1625 +1602 @@
         chip->mpu_port = pci_resource_start(pci, 3);
         chip->game_port = pci_resource_start(pci, 4);
+        /* still use non-managed irq handler as it's re-acquired at PM resume */
         if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED,
                         KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_es1938_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_es1938_free;
         dev_dbg(card->dev,
                 "create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",
@@ -1640 +1618 @@
 
         snd_es1938_chip_init(chip);
-
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_es1938_free(chip);
-                return err;
-        }
-
-        *rchip = chip;
         return 0;
 }
@@ -1782 +1752 @@
        
 
-static int snd_es1938_probe(struct pci_dev *pci,
-                            const struct pci_device_id *pci_id)
+static int __snd_es1938_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -1798 +1768 @@
         }
 
-        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;
-        for (idx = 0; idx < 5; idx++) {
+        chip = card->private_data;
+
+        for (idx = 0; idx < 5; idx++)
                 if (pci_resource_start(pci, idx) == 0 ||
-                    !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
-                        snd_card_free(card);
-                        return -ENODEV;
-                }
-        }
-        err = snd_es1938_create(card, pci, &chip);
-        if (err < 0) {
-                snd_card_free(card);
+                    !(pci_resource_flags(pci, idx) & IORESOURCE_IO))
+                        return -ENODEV;
+
+        err = snd_es1938_create(card, pci);
+        if (err < 0)
                 return err;
-        }
-        card->private_data = chip;
 
         strcpy(card->driver, "ES1938");
@@ -1824 +1791 @@
 
         err = snd_es1938_new_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         err = snd_es1938_mixer(chip);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         if (snd_opl3_create(card,
                             SLSB_REG(chip, FMLOWADDR),
@@ -1841 +1804 @@
         } else {
                 err = snd_opl3_timer_new(opl3, 0, 1);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
                 err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
         }
         if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
@@ -1865 +1824 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         pci_set_drvdata(pci, card);
@@ -1875 +1832 @@
 }
 
-static void snd_es1938_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_es1938_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_es1938_probe(pci, pci_id));
 }
 
@@ -1884 +1842 @@
         .id_table = snd_es1938_ids,
         .probe = snd_es1938_probe,
-        .remove = snd_es1938_remove,
         .driver = {
                 .pm = ES1938_PM_OPS,