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

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

@@ -308 +308 @@
 #define CM_MICGAINZ_SHIFT       0
 
-#define CM_REG_MIXER3           0x24
 #define CM_REG_AUX_VOL          0x26
 #define CM_VAUXL_MASK           0xf0
@@ -2873 +2872 @@
                 for (i = 0; ports[i]; i++) {
                         io_port = ports[i];
-                        r = request_region(io_port, 1, "CMIPCI gameport");
+                        r = devm_request_region(&cm->pci->dev, io_port, 1,
+                                                "CMIPCI gameport");
                         if (r)
                                 break;
@@ -2879 +2879 @@
         } else {
                 io_port = joystick_port[dev];
-                r = request_region(io_port, 1, "CMIPCI gameport");
+                r = devm_request_region(&cm->pci->dev, io_port, 1,
+                                        "CMIPCI gameport");
         }
 
@@ -2890 +2891 @@
         if (!gp) {
                 dev_err(cm->card->dev, "cannot allocate memory for gameport\n");
-                release_and_free_resource(r);
                 return -ENOMEM;
         }
@@ -2897 +2897 @@
         gameport_set_dev_parent(gp, &cm->pci->dev);
         gp->io = io_port;
-        gameport_set_port_data(gp, r);
 
         snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
@@ -2909 +2908 @@
 {
         if (cm->gameport) {
-                struct resource *r = gameport_get_port_data(cm->gameport);
-
                 gameport_unregister_port(cm->gameport);
                 cm->gameport = NULL;
 
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
-                release_and_free_resource(r);
         }
 }
@@ -2923 +2919 @@
 #endif
 
-static int snd_cmipci_free(struct cmipci *cm)
-{
-        if (cm->irq >= 0) {
-                snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);
-                snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_ENSPDOUT);
-                snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);  /* disable ints */
-                snd_cmipci_ch_reset(cm, CM_CH_PLAY);
-                snd_cmipci_ch_reset(cm, CM_CH_CAPT);
-                snd_cmipci_write(cm, CM_REG_FUNCTRL0, 0); /* disable channels */
-                snd_cmipci_write(cm, CM_REG_FUNCTRL1, 0);
-
-                /* reset mixer */
-                snd_cmipci_mixer_write(cm, 0, 0);
-
-                free_irq(cm->irq, cm);
-        }
+static void snd_cmipci_free(struct snd_card *card)
+{
+        struct cmipci *cm = card->private_data;
+
+        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);
+        snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_ENSPDOUT);
+        snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);  /* disable ints */
+        snd_cmipci_ch_reset(cm, CM_CH_PLAY);
+        snd_cmipci_ch_reset(cm, CM_CH_CAPT);
+        snd_cmipci_write(cm, CM_REG_FUNCTRL0, 0); /* disable channels */
+        snd_cmipci_write(cm, CM_REG_FUNCTRL1, 0);
+
+        /* reset mixer */
+        snd_cmipci_mixer_write(cm, 0, 0);
 
         snd_cmipci_free_gameport(cm);
-        pci_release_regions(cm->pci);
-        pci_disable_device(cm->pci);
-        kfree(cm);
-        return 0;
-}
-
-static int snd_cmipci_dev_free(struct snd_device *device)
-{
-        struct cmipci *cm = device->device_data;
-        return snd_cmipci_free(cm);
 }
 
@@ -3009 +2993 @@
 
 static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,
-                             int dev, struct cmipci **rcmipci)
-{
-        struct cmipci *cm;
+                             int dev)
+{
+        struct cmipci *cm = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_cmipci_dev_free,
-        };
         unsigned int val;
         long iomidi = 0;
@@ -3026 +3007 @@
         };
 
-        *rcmipci = NULL;
-
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-
-        cm = kzalloc(sizeof(*cm), GFP_KERNEL);
-        if (cm == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
 
         spin_lock_init(&cm->reg_lock);
@@ -3049 +3022 @@
 
         err = pci_request_regions(pci, card->driver);
-        if (err < 0) {
-                kfree(cm);
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         cm->iobase = pci_resource_start(pci, 0);
 
-        if (request_irq(pci->irq, snd_cmipci_interrupt,
-                        IRQF_SHARED, KBUILD_MODNAME, cm)) {
+        if (devm_request_irq(&pci->dev, pci->irq, snd_cmipci_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, cm)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_cmipci_free(cm);
                 return -EBUSY;
         }
         cm->irq = pci->irq;
         card->sync_irq = cm->irq;
+        card->private_free = snd_cmipci_free;
 
         pci_set_master(cm->pci);
@@ -3163 +3133 @@
                 card->shortname, modelstr, cm->iobase, cm->irq);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops);
-        if (err < 0) {
-                snd_cmipci_free(cm);
-                return err;
-        }
-
         if (cm->chip_version >= 39) {
                 val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);
@@ -3261 +3225 @@
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
 
-        *rcmipci = cm;
         return 0;
 }
@@ -3285 +3248 @@
         }
 
-        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(*cm), &card);
         if (err < 0)
                 return err;
+        cm = card->private_data;
         
         switch (pci->device) {
@@ -3304 +3268 @@
         }
 
-        err = snd_cmipci_create(card, pci, dev, &cm);
+        err = snd_cmipci_create(card, pci, dev);
         if (err < 0)
-                goto free_card;
-
-        card->private_data = cm;
+                goto error;
 
         err = snd_card_register(card);
         if (err < 0)
-                goto free_card;
+                goto error;
 
         pci_set_drvdata(pci, card);
@@ -3318 +3280 @@
         return 0;
 
-free_card:
+ error:
         snd_card_free(card);
         return err;
 }
 
-static void snd_cmipci_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
-}
-
-
 #ifdef CONFIG_PM_SLEEP
 /*
@@ -3335 +3291 @@
 static const unsigned char saved_regs[] = {
         CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,
-        CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL,
+        CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_AUX_VOL, CM_REG_PLL,
         CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2,
         CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,
@@ -3403 +3359 @@
         .id_table = snd_cmipci_ids,
         .probe = snd_cmipci_probe,
-        .remove = snd_cmipci_remove,
         .driver = {
                 .pm = SND_CMIPCI_PM_OPS,