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

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

@@ -666 +666 @@
 };
 
-static int snd_bt87x_free(struct snd_bt87x *chip)
-{
-        if (chip->mmio)
-                snd_bt87x_stop(chip);
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
-        iounmap(chip->mmio);
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_bt87x_dev_free(struct snd_device *device)
-{
-        struct snd_bt87x *chip = device->device_data;
-        return snd_bt87x_free(chip);
+static void snd_bt87x_free(struct snd_card *card)
+{
+        struct snd_bt87x *chip = card->private_data;
+
+        snd_bt87x_stop(chip);
 }
 
@@ -704 +692 @@
 
 static int snd_bt87x_create(struct snd_card *card,
-                            struct pci_dev *pci,
-                            struct snd_bt87x **rchip)
-{
-        struct snd_bt87x *chip;
+                            struct pci_dev *pci)
+{
+        struct snd_bt87x *chip = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free = snd_bt87x_dev_free
-        };
-
-        *rchip = NULL;
-
-        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->card = card;
         chip->pci = pci;
@@ -729 +706 @@
         spin_lock_init(&chip->reg_lock);
 
+#ifndef TARGET_OS2
+        err = pcim_iomap_regions(pci, 1 << 0, "Bt87x audio");
+        if (err < 0)
+                return err;
+        chip->mmio = pcim_iomap_table(pci)[0];
+#else
         err = pci_request_regions(pci, "Bt87x audio");
         if (err < 0) {
@@ -736 +719 @@
         }
         chip->mmio = pci_ioremap_bar(pci, 0);
-        if (!chip->mmio) {
-                dev_err(card->dev, "cannot remap io memory\n");
-                err = -ENOMEM;
-                goto fail;
-        }
-
+#endif
         chip->reg_control = CTL_A_PWRDN | CTL_DA_ES2 |
                             CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT);
@@ -749 +727 @@
         snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
 
-        err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
-                          KBUILD_MODNAME, chip);
+        err = devm_request_irq(&pci->dev, pci->irq, snd_bt87x_interrupt,
+                               IRQF_SHARED, KBUILD_MODNAME, chip);
         if (err < 0) {
                 dev_err(card->dev, "cannot grab irq %d\n", pci->irq);
-                goto fail;
+                return err;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_bt87x_free;
         pci_set_master(pci);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0)
-                goto fail;
-
-        *rchip = chip;
-        return 0;
-
-fail:
-        snd_bt87x_free(chip);
-        return err;
+        return 0;
 }
 
@@ -854 +824 @@
 }
 
-static int snd_bt87x_probe(struct pci_dev *pci,
-                           const struct pci_device_id *pci_id)
+static int __snd_bt87x_probe(struct pci_dev *pci,
+                             const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -878 +848 @@
         }
 
-        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(*chip), &card);
         if (err < 0)
                 return err;
-
-        err = snd_bt87x_create(card, pci, &chip);
+        chip = card->private_data;
+
+        err = snd_bt87x_create(card, pci);
         if (err < 0)
-                goto _error;
+                return err;
 
         memcpy(&chip->board, &snd_bt87x_boards[boardid], sizeof(chip->board));
@@ -897 +868 @@
                 err = snd_bt87x_pcm(chip, DEVICE_DIGITAL, "Bt87x Digital");
                 if (err < 0)
-                        goto _error;
+                        return err;
         }
         if (!chip->board.no_analog) {
                 err = snd_bt87x_pcm(chip, DEVICE_ANALOG, "Bt87x Analog");
                 if (err < 0)
-                        goto _error;
+                        return err;
                 err = snd_ctl_add(card, snd_ctl_new1(
                                   &snd_bt87x_capture_volume, chip));
                 if (err < 0)
-                        goto _error;
+                        return err;
                 err = snd_ctl_add(card, snd_ctl_new1(
                                   &snd_bt87x_capture_boost, chip));
                 if (err < 0)
-                        goto _error;
+                        return err;
                 err = snd_ctl_add(card, snd_ctl_new1(
                                   &snd_bt87x_capture_source, chip));
                 if (err < 0)
-                        goto _error;
+                        return err;
         }
         dev_info(card->dev, "bt87x%d: Using board %d, %sanalog, %sdigital "
@@ -930 +901 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto _error;
+                return err;
 
         pci_set_drvdata(pci, card);
         ++dev;
         return 0;
-
-_error:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_bt87x_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+}
+
+static int snd_bt87x_probe(struct pci_dev *pci,
+                           const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_bt87x_probe(pci, pci_id));
 }
 
@@ -958 +926 @@
         .id_table = snd_bt87x_ids,
         .probe = snd_bt87x_probe,
-        .remove = snd_bt87x_remove,
 };