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

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

@@ -750 +750 @@
         if (joystick_port[dev] == 1) { /* auto-detect */
                 for (io_port = 0x200; io_port <= 0x218; io_port += 8) {
-                        r = request_region(io_port, 8, "ALS4000 gameport");
+                        r = devm_request_region(&acard->pci->dev, io_port, 8,
+                                                "ALS4000 gameport");
                         if (r)
                                 break;
@@ -756 +757 @@
         } else {
                 io_port = joystick_port[dev];
-                r = request_region(io_port, 8, "ALS4000 gameport");
+                r = devm_request_region(&acard->pci->dev, io_port, 8,
+                                        "ALS4000 gameport");
         }
 
@@ -767 +769 @@
         if (!gp) {
                 dev_err(&acard->pci->dev, "cannot allocate memory for gameport\n");
-                release_and_free_resource(r);
                 return -ENOMEM;
         }
@@ -775 +776 @@
         gameport_set_dev_parent(gp, &acard->pci->dev);
         gp->io = io_port;
-        gameport_set_port_data(gp, r);
 
         /* Enable legacy joystick port */
@@ -788 +788 @@
 {
         if (acard->gameport) {
-                struct resource *r = gameport_get_port_data(acard->gameport);
-
                 gameport_unregister_port(acard->gameport);
                 acard->gameport = NULL;
@@ -795 +793 @@
                 /* disable joystick */
                 snd_als4000_set_addr(acard->iobase, 0, 0, 0, 0);
-
-                release_and_free_resource(r);
         }
 }
@@ -812 +808 @@
         /* free resources */
         snd_als4000_free_gameport(acard);
-        pci_release_regions(acard->pci);
-        pci_disable_device(acard->pci);
-}
-
-static int snd_card_als4000_probe(struct pci_dev *pci,
-                                  const struct pci_device_id *pci_id)
+}
+
+static int __snd_card_als4000_probe(struct pci_dev *pci,
+                                    const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -836 +830 @@
 
         /* enable PCI device */
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
@@ -843 +837 @@
         if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(24))) {
                 dev_err(&pci->dev, "architecture does not support 24bit PCI busmaster DMA\n");
-                pci_disable_device(pci);
                 return -ENXIO;
         }
 
         err = pci_request_regions(pci, "ALS4000");
-        if (err < 0) {
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         iobase = pci_resource_start(pci, 0);
 
@@ -858 +849 @@
         pci_set_master(pci);
         
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           sizeof(*acard) /* private_data: acard */,
-                           &card);
-        if (err < 0) {
-                pci_release_regions(pci);
-                pci_disable_device(pci);
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*acard) /* private_data: acard */,
+                                &card);
+        if (err < 0)
                 return err;
-        }
 
         acard = card->private_data;
@@ -885 +873 @@
                                &chip);
         if (err < 0)
-                goto out_err;
+                return err;
         acard->chip = chip;
 
@@ -906 +894 @@
                 dev_err(&pci->dev, "no MPU-401 device at 0x%lx?\n",
                                 iobase + ALS4K_IOB_30_MIDI_DATA);
-                goto out_err;
+                return err;
         }
         /* FIXME: ALS4000 has interesting MPU401 configuration features
@@ -916 +904 @@
         err = snd_als4000_pcm(chip, 0);
         if (err < 0)
-                goto out_err;
+                return err;
 
         err = snd_sbmixer_new(chip);
         if (err < 0)
-                goto out_err;
+                return err;
 
         if (snd_opl3_create(card,
@@ -932 +920 @@
                 err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
                 if (err < 0)
-                        goto out_err;
+                        return err;
         }
 
@@ -939 +927 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto out_err;
+                return err;
 
         pci_set_drvdata(pci, card);
         dev++;
-        err = 0;
-        goto out;
-
-out_err:
-        snd_card_free(card);
-        
-out:
-        return err;
-}
-
-static void snd_card_als4000_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+        return 0;
+}
+
+static int snd_card_als4000_probe(struct pci_dev *pci,
+                                  const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_card_als4000_probe(pci, pci_id));
 }
 
@@ -1000 +982 @@
         .id_table = snd_als4000_ids,
         .probe = snd_card_als4000_probe,
-        .remove = snd_card_als4000_remove,
         .driver = {
                 .pm = SND_ALS4000_PM_OPS,