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

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

@@ -70 +70 @@
 MODULE_DEVICE_TABLE(pci, snd_cs5530_ids);
 
-static int snd_cs5530_free(struct snd_cs5530 *chip)
-{
-        pci_release_regions(chip->pci);
-        pci_disable_device(chip->pci);
-        kfree(chip);
-        return 0;
-}
-
-static int snd_cs5530_dev_free(struct snd_device *device)
-{
-        struct snd_cs5530 *chip = device->device_data;
-        return snd_cs5530_free(chip);
-}
-
-static void snd_cs5530_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
-}
-
 static u8 snd_cs5530_mixer_read(unsigned long io, u8 reg)
 {
@@ -99 +80 @@
 
 static int snd_cs5530_create(struct snd_card *card,
-                             struct pci_dev *pci,
-                             struct snd_cs5530 **rchip)
+                             struct pci_dev *pci)
 {
-        struct snd_cs5530 *chip;
+        struct snd_cs5530 *chip = card->private_data;
         unsigned long sb_base;
         u8 irq, dma8, dma16 = 0;
@@ -109 +89 @@
         int err;
 
-        static const struct snd_device_ops ops = {
-                .dev_free = snd_cs5530_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 == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
 
         chip->card = card;
         chip->pci = pci;
 
-        err = pci_request_regions(pci, "CS5530");
-        if (err < 0) {
-                kfree(chip); 
-                pci_disable_device(pci);
-                return err;
-        }
+        err = pcim_iomap_regions(pci, 1 << 0, "CS5530");
+        if (err < 0)
+                return err;
         chip->pci_base = pci_resource_start(pci, 0);
-
+#ifndef TARGET_OS2
+        mem = pcim_iomap_table(pci)[0];
+#else
         mem = pci_ioremap_bar(pci, 0);
-        if (mem == NULL) {
-                snd_cs5530_free(chip);
-                return -EBUSY;
-        }
-
+#endif
         map = readw(mem + 0x18);
-        iounmap(mem);
 
         /* Map bits
@@ -159 +122 @@
         else {
                 dev_err(card->dev, "Could not find XpressAudio!\n");
-                snd_cs5530_free(chip);
                 return -ENODEV;
         }
@@ -179 +141 @@
         else {
                 dev_err(card->dev, "No 16bit DMA enabled\n");
-                snd_cs5530_free(chip);
                 return -ENODEV;
         }
@@ -191 +152 @@
         else {
                 dev_err(card->dev, "No 8bit DMA enabled\n");
-                snd_cs5530_free(chip);
                 return -ENODEV;
         }
@@ -205 +165 @@
         else {
                 dev_err(card->dev, "SoundBlaster IRQ not set\n");
-                snd_cs5530_free(chip);
                 return -ENODEV;
         }
@@ -215 +174 @@
         if (err < 0) {
                 dev_err(card->dev, "Could not create SoundBlaster\n");
-                snd_cs5530_free(chip);
                 return err;
         }
@@ -222 +180 @@
         if (err < 0) {
                 dev_err(card->dev, "Could not create PCM\n");
-                snd_cs5530_free(chip);
                 return err;
         }
@@ -229 +186 @@
         if (err < 0) {
                 dev_err(card->dev, "Could not create Mixer\n");
-                snd_cs5530_free(chip);
-                return err;
-        }
-
-        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_cs5530_free(chip);
-                return err;
-        }
-
-        *rchip = chip;
+                return err;
+        }
+
         return 0;
 }
@@ -248 +197 @@
         static int dev;
         struct snd_card *card;
-        struct snd_cs5530 *chip = NULL;
+        struct snd_cs5530 *chip;
         int err;
 
@@ -258 +207 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-
-        if (err < 0)
-                return err;
-
-        err = snd_cs5530_create(card, pci, &chip);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        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_cs5530_create(card, pci);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "CS5530");
@@ -275 +222 @@
 
         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++;
@@ -288 +233 @@
         .id_table = snd_cs5530_ids,
         .probe = snd_cs5530_probe,
-        .remove = snd_cs5530_remove,
 };