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

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

@@ -242 +242 @@
 }
 
-static int snd_cs5535audio_free(struct cs5535audio *cs5535au)
-{
-        pci_set_power_state(cs5535au->pci, PCI_D3hot);
-
-        if (cs5535au->irq >= 0)
-                free_irq(cs5535au->irq, cs5535au);
-
-        pci_release_regions(cs5535au->pci);
-        pci_disable_device(cs5535au->pci);
-        kfree(cs5535au);
-        return 0;
-}
-
-static int snd_cs5535audio_dev_free(struct snd_device *device)
-{
-        struct cs5535audio *cs5535au = device->device_data;
-        return snd_cs5535audio_free(cs5535au);
+static void snd_cs5535audio_free(struct snd_card *card)
+{
+        olpc_quirks_cleanup();
 }
 
 static int snd_cs5535audio_create(struct snd_card *card,
-                                  struct pci_dev *pci,
-                                  struct cs5535audio **rcs5535au)
-{
-        struct cs5535audio *cs5535au;
-
+                                  struct pci_dev *pci)
+{
+        struct cs5535audio *cs5535au = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_cs5535audio_dev_free,
-        };
-
-        *rcs5535au = NULL;
-        err = pci_enable_device(pci);
+
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
@@ -279 +259 @@
         if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32))) {
                 dev_warn(card->dev, "unable to get 32bit dma\n");
-                err = -ENXIO;
-                goto pcifail;
-        }
-
-        cs5535au = kzalloc(sizeof(*cs5535au), GFP_KERNEL);
-        if (cs5535au == NULL) {
-                err = -ENOMEM;
-                goto pcifail;
+                return -ENXIO;
         }
 
@@ -295 +268 @@
 
         err = pci_request_regions(pci, "CS5535 Audio");
-        if (err < 0) {
-                kfree(cs5535au);
-                goto pcifail;
-        }
+        if (err < 0)
+                return err;
 
         cs5535au->port = pci_resource_start(pci, 0);
 
-        if (request_irq(pci->irq, snd_cs5535audio_interrupt,
-                        IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {
+        if (devm_request_irq(&pci->dev, pci->irq, snd_cs5535audio_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                err = -EBUSY;
-                goto sndfail;
+                return -EBUSY;
         }
 
@@ -313 +283 @@
         pci_set_master(pci);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cs5535au, &ops);
-        if (err < 0)
-                goto sndfail;
-
-        *rcs5535au = cs5535au;
         return 0;
-
-sndfail: /* leave the device alive, just kill the snd */
-        snd_cs5535audio_free(cs5535au);
-        return err;
-
-pcifail:
-        pci_disable_device(pci);
-        return err;
-}
-
-static int snd_cs5535audio_probe(struct pci_dev *pci,
-                                 const struct pci_device_id *pci_id)
+}
+
+static int __snd_cs5535audio_probe(struct pci_dev *pci,
+                                   const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -344 +301 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-        if (err < 0)
-                return err;
-
-        err = snd_cs5535audio_create(card, pci, &cs5535au);
-        if (err < 0)
-                goto probefail_out;
-
-        card->private_data = cs5535au;
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*cs5535au), &card);
+        if (err < 0)
+                return err;
+        cs5535au = card->private_data;
+        card->private_free = snd_cs5535audio_free;
+
+        err = snd_cs5535audio_create(card, pci);
+        if (err < 0)
+                return err;
 
         err = snd_cs5535audio_mixer(cs5535au);
         if (err < 0)
-                goto probefail_out;
+                return err;
 
         err = snd_cs5535audio_pcm(cs5535au);
         if (err < 0)
-                goto probefail_out;
+                return err;
 
         strcpy(card->driver, DRIVER_NAME);
@@ -372 +329 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto probefail_out;
+                return err;
 
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
-
-probefail_out:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_cs5535audio_remove(struct pci_dev *pci)
-{
-        olpc_quirks_cleanup();
-        snd_card_free(pci_get_drvdata(pci));
+}
+
+static int snd_cs5535audio_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_cs5535audio_probe(pci, pci_id));
 }
 
@@ -393 +346 @@
         .id_table = snd_cs5535audio_ids,
         .probe = snd_cs5535audio_probe,
-        .remove = snd_cs5535audio_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {