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

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

@@ -2351 +2351 @@
  */
 
-static int snd_m3_free(struct snd_m3 *chip)
-{
+static void snd_m3_free(struct snd_card *card)
+{
+        struct snd_m3 *chip = card->private_data;
         struct m3_dma *s;
         int i;
 
         cancel_work_sync(&chip->hwvol_work);
-#ifdef CONFIG_SND_MAESTRO3_INPUT
-        if (chip->input_dev)
-                input_unregister_device(chip->input_dev);
-#endif
 
         if (chip->substreams) {
@@ -2371 +2368 @@
                 }
                 spin_unlock_irq(&chip->reg_lock);
-                kfree(chip->substreams);
         }
         if (chip->iobase) {
@@ -2380 +2376 @@
         vfree(chip->suspend_mem);
 #endif
-
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
-
-        if (chip->iobase)
-                pci_release_regions(chip->pci);
-
         release_firmware(chip->assp_kernel_image);
         release_firmware(chip->assp_minisrc_image);
-
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
 }
 
@@ -2485 +2470 @@
         int err;
 
-        input_dev = input_allocate_device();
+        input_dev = devm_input_allocate_device(&chip->pci->dev);
         if (!input_dev)
                 return -ENOMEM;
@@ -2505 +2490 @@
 
         err = input_register_device(input_dev);
-        if (err) {
-                input_free_device(input_dev);
+        if (err)
                 return err;
-        }
 
         chip->input_dev = input_dev;
@@ -2517 +2500 @@
 /*
  */
-
-static int snd_m3_dev_free(struct snd_device *device)
-{
-        struct snd_m3 *chip = device->device_data;
-        return snd_m3_free(chip);
-}
 
 static int
 snd_m3_create(struct snd_card *card, struct pci_dev *pci,
               int enable_amp,
-              int amp_gpio,
-              struct snd_m3 **chip_ret)
-{
-        struct snd_m3 *chip;
+              int amp_gpio)
+{
+        struct snd_m3 *chip = card->private_data;
         int i, err;
         const struct snd_pci_quirk *quirk;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_m3_dev_free,
-        };
-
-        *chip_ret = NULL;
-
-        if (pci_enable_device(pci))
+
+        if (pcim_enable_device(pci))
                 return -EIO;
 
@@ -2546 +2517 @@
                 dev_err(card->dev,
                         "architecture does not support 28bit 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;
         }
 
@@ -2571 +2535 @@
         chip->irq = -1;
         INIT_WORK(&chip->hwvol_work, snd_m3_update_hw_volume);
+        card->private_free = snd_m3_free;
 
         chip->external_amp = enable_amp;
@@ -2600 +2565 @@
 
         chip->num_substreams = NR_DSPS;
+#ifndef TARGET_OS2
+        chip->substreams = devm_kcalloc(&pci->dev, chip->num_substreams,
+                                        sizeof(struct m3_dma), GFP_KERNEL);
+#else
         chip->substreams = kcalloc(chip->num_substreams, sizeof(struct m3_dma),
                                    GFP_KERNEL);
-        if (chip->substreams == NULL) {
-                kfree(chip);
-                pci_disable_device(pci);
+#endif
+        if (!chip->substreams)
                 return -ENOMEM;
-        }
 
         err = request_firmware(&chip->assp_kernel_image,
                                "ess/maestro3_assp_kernel.fw", &pci->dev);
         if (err < 0)
-                goto free_chip;
+                return err;
 
         err = request_firmware(&chip->assp_minisrc_image,
                                "ess/maestro3_assp_minisrc.fw", &pci->dev);
         if (err < 0)
-                goto free_chip;
+                return err;
 
         err = pci_request_regions(pci, card->driver);
         if (err < 0)
-                goto free_chip;
+                return err;
 
         chip->iobase = pci_resource_start(pci, 0);
@@ -2636 +2603 @@
         snd_m3_hv_init(chip);
 
+#ifndef TARGET_OS2
+        if (devm_request_irq(&pci->dev, pci->irq, snd_m3_interrupt, IRQF_SHARED,
+                             KBUILD_MODNAME, chip)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
+                return -ENOMEM;
+        }
+#else
         if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
                         KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                err = -ENOMEM;
-                goto free_chip;
-        }
+                return -ENOMEM;
+        }
+#endif
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
@@ -2654 +2628 @@
 #endif
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0)
-                goto free_chip;
-
         err = snd_m3_mixer(chip);
         if (err < 0)
@@ -2686 +2656 @@
         snd_m3_assp_continue(chip);
 
-        *chip_ret = chip;
-
         return 0; 
-
-free_chip:
-        snd_m3_free(chip);
-        return err;
 }
 
@@ -2698 +2662 @@
  */
 static int
-snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
+__snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -2716 +2680 @@
         }
 
-        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;
 
         switch (pci->device) {
@@ -2735 +2700 @@
         }
 
-        err = snd_m3_create(card, pci, external_amp[dev], amp_gpio[dev], &chip);
+        err = snd_m3_create(card, pci, external_amp[dev], amp_gpio[dev]);
         if (err < 0)
-                goto free_card;
-
-        card->private_data = chip;
+                return err;
 
         sprintf(card->shortname, "ESS %s PCI", card->driver);
@@ -2747 +2710 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto free_card;
+                return err;
 
 #if 0 /* TODO: not supported yet */
@@ -2762 +2725 @@
         dev++;
         return 0;
-
-free_card:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_m3_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+}
+
+static int
+snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_m3_probe(pci, pci_id));
 }
 
@@ -2777 +2737 @@
         .id_table = snd_m3_ids,
         .probe = snd_m3_probe,
-        .remove = snd_m3_remove,
         .driver = {
                 .pm = M3_PM_OPS,