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

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

@@ -1037 +1037 @@
 };
 
-static void snd_fm801_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
-{
-        struct fm801 *chip = bus->private_data;
-        chip->ac97_bus = NULL;
-}
-
-static void snd_fm801_mixer_free_ac97(struct snd_ac97 *ac97)
-{
-        struct fm801 *chip = ac97->private_data;
-        if (ac97->num == 0) {
-                chip->ac97 = NULL;
-        } else {
-                chip->ac97_sec = NULL;
-        }
-}
-
 static int snd_fm801_mixer(struct fm801 *chip)
 {
@@ -1066 +1050 @@
         if (err < 0)
                 return err;
-        chip->ac97_bus->private_free = snd_fm801_mixer_free_ac97_bus;
 
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
-        ac97.private_free = snd_fm801_mixer_free_ac97;
         err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97);
         if (err < 0)
@@ -1186 +1168 @@
 }
 
-static int snd_fm801_free(struct fm801 *chip)
-{
+static void snd_fm801_free(struct snd_card *card)
+{
+        struct fm801 *chip = card->private_data;
         unsigned short cmdw;
-
-        if (chip->irq < 0)
-                goto __end_hw;
 
         /* interrupt setup - mask everything */
@@ -1198 +1178 @@
         fm801_writew(chip, IRQ_MASK, cmdw);
 
-        devm_free_irq(chip->dev, chip->irq, chip);
-
-      __end_hw:
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
         if (!(chip->tea575x_tuner & TUNER_DISABLED)) {
@@ -1207 +1184 @@
         }
 #endif
-        return 0;
-}
-
-static int snd_fm801_dev_free(struct snd_device *device)
-{
-        struct fm801 *chip = device->device_data;
-        return snd_fm801_free(chip);
-}
+}
+
 
 static int snd_fm801_create(struct snd_card *card,
                             struct pci_dev *pci,
                             int tea575x_tuner,
-                            int radio_nr,
-                            struct fm801 **rchip)
-{
-        struct fm801 *chip;
+                            int radio_nr)
+{
+        struct fm801 *chip = card->private_data;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_fm801_dev_free,
-        };
-
-        *rchip = NULL;
+
 #ifndef TARGET_OS2
         err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-        chip = devm_kzalloc(&pci->dev, sizeof(*chip), GFP_KERNEL);
 #else
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 #endif
-        if (chip == NULL)
-                return -ENOMEM;
         spin_lock_init(&chip->reg_lock);
         chip->card = card;
@@ -1277 +1239 @@
 #endif
                         dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                        snd_fm801_free(chip);
                         return -EBUSY;
                 }
@@ -1285 +1246 @@
         }
 
+        card->private_free = snd_fm801_free;
         snd_fm801_chip_init(chip);
-
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_fm801_free(chip);
-                return err;
-        }
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
         err = v4l2_device_register(&pci->dev, &chip->v4l2_dev);
-        if (err < 0) {
-                snd_fm801_free(chip);
-                return err;
-        }
+        if (err < 0)
+                return err;
         chip->tea.v4l2_dev = &chip->v4l2_dev;
         chip->tea.radio_nr = radio_nr;
@@ -1308 +1262 @@
                 if (snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                         dev_err(card->dev, "TEA575x radio not found\n");
-                        snd_fm801_free(chip);
                         return -ENODEV;
                 }
@@ -1336 +1289 @@
         }
 #endif
-
-        *rchip = chip;
-        return 0;
-}
-
-static int snd_card_fm801_probe(struct pci_dev *pci,
-                                const struct pci_device_id *pci_id)
+        return 0;
+}
+
+static int __snd_card_fm801_probe(struct pci_dev *pci,
+                                  const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -1357 +1308 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-        if (err < 0)
-                return err;
-        err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        card->private_data = chip;
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                                sizeof(*chip), &card);
+        if (err < 0)
+                return err;
+        chip = card->private_data;
+        err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev]);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "FM801");
@@ -1378 +1327 @@
 
         err = snd_fm801_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_fm801_mixer(chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
                                   chip->port + FM801_MPU401_DATA,
@@ -1392 +1337 @@
                                   MPU401_INFO_IRQ_HOOK,
                                   -1, &chip->rmidi);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_opl3_create(card, chip->port + FM801_OPL3_BANK0,
                               chip->port + FM801_OPL3_BANK1,
                               OPL3_HW_OPL3_FM801, 1, &opl3);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
 
       __fm801_tuner_only:
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         pci_set_drvdata(pci, card);
         dev++;
@@ -1420 +1357 @@
 }
 
-static void snd_card_fm801_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_card_fm801_probe(struct pci_dev *pci,
+                                const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_card_fm801_probe(pci, pci_id));
 }
 
@@ -1492 +1430 @@
         .id_table = snd_fm801_ids,
         .probe = snd_card_fm801_probe,
-        .remove = snd_card_fm801_remove,
         .driver = {
                 .pm = SND_FM801_PM_OPS,