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

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

@@ -1916 +1916 @@
 {
         struct gameport *gp;
-        struct resource *r;
 
         if (!joystick)
                 return -ENODEV;
 
-        r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
-        if (!r) {
+        if (!devm_request_region(chip->card->dev, JOYSTICK_ADDR, 8,
+                                 "VIA686 gameport")) {
                 dev_warn(chip->card->dev, "cannot reserve joystick port %#x\n",
                        JOYSTICK_ADDR);
@@ -1932 +1931 @@
                 dev_err(chip->card->dev,
                         "cannot allocate memory for gameport\n");
-                release_and_free_resource(r);
                 return -ENOMEM;
         }
@@ -1940 +1938 @@
         gameport_set_dev_parent(gp, &chip->pci->dev);
         gp->io = JOYSTICK_ADDR;
-        gameport_set_port_data(gp, r);
 
         /* Enable legacy joystick port */
@@ -1954 +1951 @@
 {
         if (chip->gameport) {
-                struct resource *r = gameport_get_port_data(chip->gameport);
-
                 gameport_unregister_port(chip->gameport);
                 chip->gameport = NULL;
-                release_and_free_resource(r);
         }
 }
@@ -2068 +2062 @@
         }
         if (mpu_port >= 0x200)
-                chip->mpu_res = request_region(mpu_port, 2, "VIA82xx MPU401");
+                chip->mpu_res = devm_request_region(&chip->pci->dev, mpu_port,
+                                                    2, "VIA82xx MPU401");
         if (chip->mpu_res) {
                 if (rev_h)
@@ -2307 +2302 @@
 #endif /* CONFIG_PM_SLEEP */
 
-static int snd_via82xx_free(struct via82xx *chip)
-{
+static void snd_via82xx_free(struct snd_card *card)
+{
+        struct via82xx *chip = card->private_data;
         unsigned int i;
 
-        if (chip->irq < 0)
-                goto __end_hw;
         /* disable interrupts */
         for (i = 0; i < chip->num_devs; i++)
                 snd_via82xx_channel_reset(chip, &chip->devs[i]);
-
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
- __end_hw:
-        release_and_free_resource(chip->mpu_res);
-        pci_release_regions(chip->pci);
 
         if (chip->chip_type == TYPE_VIA686) {
@@ -2328 +2316 @@
                 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, chip->old_legacy_cfg);
         }
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_via82xx_dev_free(struct snd_device *device)
-{
-        struct via82xx *chip = device->device_data;
-        return snd_via82xx_free(chip);
 }
 
@@ -2343 +2322 @@
                               int chip_type,
                               int revision,
-                              unsigned int ac97_clock,
-                              struct via82xx **r_via)
-{
-        struct via82xx *chip;
+                              unsigned int ac97_clock)
+{
+        struct via82xx *chip = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_via82xx_dev_free,
-        };
-
-        err = pci_enable_device(pci);
+
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (!chip) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
 
         chip->chip_type = chip_type;
@@ -2378 +2347 @@
 
         err = pci_request_regions(pci, card->driver);
-        if (err < 0) {
-                kfree(chip);
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         chip->port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq,
-                        chip_type == TYPE_VIA8233 ?
-                        snd_via8233_interrupt : snd_via686_interrupt,
-                        IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
+        if (devm_request_irq(&pci->dev, pci->irq,
+                             chip_type == TYPE_VIA8233 ?
+                             snd_via8233_interrupt : snd_via686_interrupt,
+                             IRQF_SHARED,
+                             KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_via82xx_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_via82xx_free;
         if (ac97_clock >= 8000 && ac97_clock <= 48000)
                 chip->ac97_clock = ac97_clock;
 
         err = snd_via82xx_chip_init(chip);
-        if (err < 0) {
-                snd_via82xx_free(chip);
+        if (err < 0)
                 return err;
-        }
-
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_via82xx_free(chip);
-                return err;
-        }
 
         /* The 8233 ac97 controller does not implement the master bit
@@ -2414 +2372 @@
          * We call pci_set_master here because it does not hurt. */
         pci_set_master(pci);
-
-        *r_via = chip;
         return 0;
 }
@@ -2507 +2463 @@
 };
 
-static int snd_via82xx_probe(struct pci_dev *pci,
-                             const struct pci_device_id *pci_id)
+static int __snd_via82xx_probe(struct pci_dev *pci,
+                               const struct pci_device_id *pci_id)
 {
         struct snd_card *card;
@@ -2516 +2472 @@
         int err;
 
-        err = snd_card_new(&pci->dev, index, id, THIS_MODULE, 0, &card);
+        err = snd_devm_card_new(&pci->dev, index, id, THIS_MODULE,
+                                sizeof(*chip), &card);
         if (err < 0)
                 return err;
+        chip = card->private_data;
 
         card_type = pci_id->driver_data;
@@ -2557 +2515 @@
         default:
                 dev_err(card->dev, "invalid card type %d\n", card_type);
-                err = -EINVAL;
-                goto __error;
+                return -EINVAL;
         }
                 
         err = snd_via82xx_create(card, pci, chip_type, pci->revision,
-                                 ac97_clock, &chip);
+                                 ac97_clock);
         if (err < 0)
-                goto __error;
-        card->private_data = chip;
+                return err;
         err = snd_via82xx_mixer_new(chip, ac97_quirk);
         if (err < 0)
-                goto __error;
+                return err;
 
         if (chip_type == TYPE_VIA686) {
                 err = snd_via686_pcm_new(chip);
                 if (err < 0)
-                        goto __error;
+                        return err;
                 err = snd_via686_init_misc(chip);
                 if (err < 0)
-                        goto __error;
+                        return err;
         } else {
                 if (chip_type == TYPE_VIA8233A) {
                         err = snd_via8233a_pcm_new(chip);
                         if (err < 0)
-                                goto __error;
+                                return err;
                         // chip->dxs_fixed = 1; /* FIXME: use 48k for DXS #3? */
                 } else {
                         err = snd_via8233_pcm_new(chip);
                         if (err < 0)
-                                goto __error;
+                                return err;
                         if (dxs_support == VIA_DXS_48K)
                                 chip->dxs_fixed = 1;
@@ -2598 +2554 @@
                 err = snd_via8233_init_misc(chip);
                 if (err < 0)
-                        goto __error;
+                        return err;
         }
 
@@ -2612 +2568 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         pci_set_drvdata(pci, card);
         return 0;
-
- __error:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_via82xx_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+}
+
+static int snd_via82xx_probe(struct pci_dev *pci,
+                             const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_via82xx_probe(pci, pci_id));
 }
 
@@ -2633 +2584 @@
         .id_table = snd_via82xx_ids,
         .probe = snd_via82xx_probe,
-        .remove = snd_via82xx_remove,
         .driver = {
                 .pm = SND_VIA82XX_PM_OPS,