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

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

@@ -1541 +1541 @@
  */
 
-static int snd_atiixp_free(struct atiixp *chip)
-{
-        if (chip->irq < 0)
-                goto __hw_end;
-        snd_atiixp_chip_stop(chip);
-
-      __hw_end:
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
-        iounmap(chip->remap_addr);
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_atiixp_dev_free(struct snd_device *device)
-{
-        struct atiixp *chip = device->device_data;
-        return snd_atiixp_free(chip);
+static void snd_atiixp_free(struct snd_card *card)
+{
+        snd_atiixp_chip_stop(card->private_data);
 }
 
@@ -1566 +1549 @@
  * constructor for chip instance
  */
-static int snd_atiixp_create(struct snd_card *card,
-                             struct pci_dev *pci,
-                             struct atiixp **r_chip)
-{
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_atiixp_dev_free,
-        };
-        struct atiixp *chip;
+static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)
+{
+        struct atiixp *chip = card->private_data;
         int err;
 
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
 
         spin_lock_init(&chip->reg_lock);
@@ -1591 +1563 @@
         chip->pci = pci;
         chip->irq = -1;
+#ifndef TARGET_OS2
+        err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP AC97");
+        if (err < 0)
+                return err;
+#else
         err = pci_request_regions(pci, "ATI IXP AC97");
         if (err < 0) {
@@ -1597 +1574 @@
                 return err;
         }
+#endif
         chip->addr = pci_resource_start(pci, 0);
+#ifndef TARGET_OS2
+        chip->remap_addr = pcim_iomap_table(pci)[0];
+#else
         chip->remap_addr = pci_ioremap_bar(pci, 0);
-        if (chip->remap_addr == NULL) {
-                dev_err(card->dev, "AC'97 space ioremap problem\n");
-                snd_atiixp_free(chip);
-                return -EIO;
-        }
-
-        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
+#endif
+        if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_atiixp_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_atiixp_free;
         pci_set_master(pci);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_atiixp_free(chip);
-                return err;
-        }
-
-        *r_chip = chip;
-        return 0;
-}
-
-
-static int snd_atiixp_probe(struct pci_dev *pci,
-                            const struct pci_device_id *pci_id)
+        return 0;
+}
+
+
+static int __snd_atiixp_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         struct snd_card *card;
@@ -1633 +1602 @@
         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;
 
         strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
         strcpy(card->shortname, "ATI IXP");
-        err = snd_atiixp_create(card, pci, &chip);
+        err = snd_atiixp_init(card, pci);
         if (err < 0)
-                goto __error;
-        card->private_data = chip;
+                return err;
 
         err = snd_atiixp_aclink_reset(chip);
         if (err < 0)
-                goto __error;
+                return err;
 
         chip->spdif_over_aclink = spdif_aclink;
@@ -1652 +1622 @@
         err = snd_atiixp_mixer_new(chip, ac97_clock, ac97_quirk);
         if (err < 0)
-                goto __error;
+                return err;
 
         err = snd_atiixp_pcm_new(chip);
         if (err < 0)
-                goto __error;
+                return err;
         
         snd_atiixp_proc_init(chip);
@@ -1674 +1644 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto __error;
+                return err;
 
         pci_set_drvdata(pci, card);
         return 0;
-
- __error:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_atiixp_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+}
+
+static int snd_atiixp_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_atiixp_probe(pci, pci_id));
 }
 
@@ -1693 +1660 @@
         .id_table = snd_atiixp_ids,
         .probe = snd_atiixp_probe,
-        .remove = snd_atiixp_remove,
         .driver = {
                 .pm = SND_ATIIXP_PM_OPS,