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

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

@@ -2479 +2479 @@
                 return -ENODEV;
 
-        r = request_region(JOYSTICK_ADDR, 8, "ES1968 gameport");
+        r = devm_request_region(&chip->pci->dev, JOYSTICK_ADDR, 8,
+                                "ES1968 gameport");
         if (!r)
                 return -EBUSY;
@@ -2487 +2488 @@
                 dev_err(chip->card->dev,
                         "cannot allocate memory for gameport\n");
-                release_and_free_resource(r);
                 return -ENOMEM;
         }
@@ -2498 +2498 @@
         gameport_set_dev_parent(gp, &chip->pci->dev);
         gp->io = JOYSTICK_ADDR;
-        gameport_set_port_data(gp, r);
 
         gameport_register_port(gp);
@@ -2508 +2507 @@
 {
         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);
         }
 }
@@ -2527 +2522 @@
         int err;
 
-        input_dev = input_allocate_device();
+        input_dev = devm_input_allocate_device(&chip->pci->dev);
         if (!input_dev)
                 return -ENOMEM;
@@ -2547 +2542 @@
 
         err = input_register_device(input_dev);
-        if (err) {
-                input_free_device(input_dev);
+        if (err)
                 return err;
-        }
 
         chip->input_dev = input_dev;
@@ -2634 +2627 @@
 #endif
 
-static int snd_es1968_free(struct es1968 *chip)
-{
+static void snd_es1968_free(struct snd_card *card)
+{
+        struct es1968 *chip = card->private_data;
+
         cancel_work_sync(&chip->hwvol_work);
-#ifdef CONFIG_SND_ES1968_INPUT
-        if (chip->input_dev)
-                input_unregister_device(chip->input_dev);
-#endif
 
         if (chip->io_port) {
@@ -2652 +2643 @@
 #endif
 
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
         snd_es1968_free_gameport(chip);
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_es1968_dev_free(struct snd_device *device)
-{
-        struct es1968 *chip = device->device_data;
-        return snd_es1968_free(chip);
 }
 
@@ -2694 +2673 @@
                              int chip_type,
                              int do_pm,
-                             int radio_nr,
-                             struct es1968 **chip_ret)
-{
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_es1968_dev_free,
-        };
-        struct es1968 *chip;
+                             int radio_nr)
+{
+        struct es1968 *chip = card->private_data;
         int i, err;
 
-        *chip_ret = NULL;
-
         /* enable PCI device */
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
@@ -2713 +2686 @@
                 dev_err(card->dev,
                         "architecture does not support 28bit PCI busmaster DMA\n");
-                pci_disable_device(pci);
                 return -ENXIO;
-        }
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (! chip) {
-                pci_disable_device(pci);
-                return -ENOMEM;
         }
 
@@ -2739 +2705 @@
 
         err = pci_request_regions(pci, "ESS Maestro");
-        if (err < 0) {
-                kfree(chip);
-                pci_disable_device(pci);
+        if (err < 0)
                 return err;
-        }
         chip->io_port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
+        if (devm_request_irq(&pci->dev, pci->irq, snd_es1968_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_es1968_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;
+        card->private_free = snd_es1968_free;
                 
         /* Clear Maestro_map */
@@ -2786 +2749 @@
         snd_es1968_chip_init(chip);
 
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_es1968_free(chip);
-                return err;
-        }
-
 #ifdef CONFIG_SND_ES1968_RADIO
         /* don't play with GPIOs on laptops */
         if (chip->pci->subsystem_vendor != 0x125d)
-                goto no_radio;
+                return 0;
         err = v4l2_device_register(&pci->dev, &chip->v4l2_dev);
-        if (err < 0) {
-                snd_es1968_free(chip);
+        if (err < 0)
                 return err;
-        }
         chip->tea.v4l2_dev = &chip->v4l2_dev;
         chip->tea.private_data = chip;
@@ -2816 +2771 @@
                 }
         }
-no_radio:
 #endif
-
-        *chip_ret = chip;
-
         return 0;
 }
@@ -2827 +2778 @@
 /*
  */
-static int snd_es1968_probe(struct pci_dev *pci,
-                            const struct pci_device_id *pci_id)
+static int __snd_es1968_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -2843 +2794 @@
         }
 
-        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;
+        chip = card->private_data;
                 
         if (total_bufsize[dev] < 128)
@@ -2858 +2810 @@
                                 pci_id->driver_data,
                                 use_pm[dev],
-                                radio_nr[dev],
-                                &chip);
-        if (err < 0) {
-                snd_card_free(card);
+                                radio_nr[dev]);
+        if (err < 0)
                 return err;
-        }
-        card->private_data = chip;
 
         switch (chip->type) {
@@ -2882 +2830 @@
 
         err = snd_es1968_pcm(chip, 0);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         err = snd_es1968_mixer(chip);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
 
         if (enable_mpu[dev] == 2) {
@@ -2934 +2878 @@
 
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
+        if (err < 0)
                 return err;
-        }
         pci_set_drvdata(pci, card);
         dev++;
@@ -2943 +2885 @@
 }
 
-static void snd_es1968_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
+static int snd_es1968_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_es1968_probe(pci, pci_id));
 }
 
@@ -2952 +2895 @@
         .id_table = snd_es1968_ids,
         .probe = snd_es1968_probe,
-        .remove = snd_es1968_remove,
         .driver = {
                 .pm = ES1968_PM_OPS,