Changeset 717 for GPL/trunk/alsa-kernel/isa

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/isa/sb/sb_common.c (modified) (6 diffs)

GPL/trunk/alsa-kernel/isa/sb/sb_common.c

@@ -169 +169 @@
 }
 
-static int snd_sbdsp_free(struct snd_sb *chip)
-{
-        release_and_free_resource(chip->res_port);
-        if (chip->irq >= 0)
-                free_irq(chip->irq, (void *) chip);
-#ifdef CONFIG_ISA
-        if (chip->dma8 >= 0) {
-                disable_dma(chip->dma8);
-                free_dma(chip->dma8);
-        }
-        if (chip->dma16 >= 0 && chip->dma16 != chip->dma8) {
-                disable_dma(chip->dma16);
-                free_dma(chip->dma16);
-        }
-#endif
-        kfree(chip);
-        return 0;
-}
-
-static int snd_sbdsp_dev_free(struct snd_device *device)
-{
-        struct snd_sb *chip = device->device_data;
-        return snd_sbdsp_free(chip);
-}
-
 int snd_sbdsp_create(struct snd_card *card,
                      unsigned long port,
@@ -205 +180 @@
         struct snd_sb *chip;
         int err;
-        static const struct snd_device_ops ops = {
-                .dev_free =     snd_sbdsp_dev_free,
-        };
 
         if (snd_BUG_ON(!r_chip))
                 return -EINVAL;
         *r_chip = NULL;
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL)
+        chip = devm_kzalloc(card->dev, sizeof(*chip), GFP_KERNEL);
+        if (!chip)
                 return -ENOMEM;
         spin_lock_init(&chip->reg_lock);
@@ -224 +196 @@
         chip->port = port;
         
-        if (request_irq(irq, irq_handler,
-                        (hardware == SB_HW_ALS4000 ||
-                         hardware == SB_HW_CS5530) ?
-                        IRQF_SHARED : 0,
-                        "SoundBlaster", (void *) chip)) {
+        if (devm_request_irq(card->dev, irq, irq_handler,
+                             (hardware == SB_HW_ALS4000 ||
+                              hardware == SB_HW_CS5530) ?
+                             IRQF_SHARED : 0,
+                             "SoundBlaster", (void *) chip)) {
                 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
-                snd_sbdsp_free(chip);
                 return -EBUSY;
         }
@@ -239 +210 @@
                 goto __skip_allocation;
         
-        chip->res_port = request_region(port, 16, "SoundBlaster");
+        chip->res_port = devm_request_region(card->dev, port, 16,
+                                             "SoundBlaster");
         if (!chip->res_port) {
                 snd_printk(KERN_ERR "sb: can't grab port 0x%lx\n", port);
-                snd_sbdsp_free(chip);
                 return -EBUSY;
         }
 
 #ifdef CONFIG_ISA
-        if (dma8 >= 0 && request_dma(dma8, "SoundBlaster - 8bit")) {
+        if (dma8 >= 0 && snd_devm_request_dma(card->dev, dma8,
+                                              "SoundBlaster - 8bit")) {
                 snd_printk(KERN_ERR "sb: can't grab DMA8 %d\n", dma8);
-                snd_sbdsp_free(chip);
                 return -EBUSY;
         }
@@ -257 +228 @@
                         /* no duplex */
                         dma16 = -1;
-                } else if (request_dma(dma16, "SoundBlaster - 16bit")) {
+                } else if (snd_devm_request_dma(card->dev, dma16,
+                                                "SoundBlaster - 16bit")) {
                         snd_printk(KERN_ERR "sb: can't grab DMA16 %d\n", dma16);
-                        snd_sbdsp_free(chip);
                         return -EBUSY;
                 }
@@ -270 +241 @@
         chip->hardware = hardware;
         err = snd_sbdsp_probe(chip);
-        if (err < 0) {
-                snd_sbdsp_free(chip);
+        if (err < 0)
                 return err;
-        }
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_sbdsp_free(chip);
-                return err;
-        }
         *r_chip = chip;
         return 0;