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

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

@@ -110 +110 @@
 
         if (!r) {
-                r = request_region(io_port, 1, "YMFPCI gameport");
+                r = devm_request_region(&chip->pci->dev, io_port, 1,
+                                        "YMFPCI gameport");
                 if (!r) {
                         dev_err(chip->card->dev,
@@ -122 +123 @@
                 dev_err(chip->card->dev,
                         "cannot allocate memory for gameport\n");
-                release_and_free_resource(r);
                 return -ENOMEM;
         }
@@ -131 +131 @@
         gameport_set_dev_parent(gp, &chip->pci->dev);
         gp->io = io_port;
-        gameport_set_port_data(gp, r);
 
         if (chip->pci->device >= 0x0010) /* YMF 744/754 */
@@ -147 +146 @@
 {
         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);
         }
 }
@@ -181 +176 @@
 
         err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
-        if (err < 0)
-                return err;
+                           sizeof(*chip), &card);
+        if (err < 0)
+                return err;
+        chip = card->private_data;
 
         switch (pci_id->device) {
@@ -204 +200 @@
                 }
                 if (fm_port[dev] > 0)
-                        fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3");
+                        fm_res = devm_request_region(&pci->dev, fm_port[dev],
+                                                     4, "YMFPCI OPL3");
                 if (fm_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_FMEN;
@@ -214 +211 @@
                 }
                 if (mpu_port[dev] > 0)
-                        mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401");
+                        mpu_res = devm_request_region(&pci->dev, mpu_port[dev],
+                                                      2, "YMFPCI MPU401");
                 if (mpu_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_MEN;
@@ -228 +226 @@
                 }
                 if (fm_port[dev] > 0)
-                        fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3");
+                        fm_res = devm_request_region(&pci->dev, fm_port[dev],
+                                                     4, "YMFPCI OPL3");
                 if (fm_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_FMEN;
@@ -243 +242 @@
                 }
                 if (mpu_port[dev] > 0)
-                        mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401");
+                        mpu_res = devm_request_region(&pci->dev, mpu_port[dev],
+                                                      2, "YMFPCI MPU401");
                 if (mpu_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_MEN;
@@ -258 +258 @@
         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
         pci_write_config_word(pci, PCIR_DSXG_ELEGACY, legacy_ctrl2);
-        err = snd_ymfpci_create(card, pci, old_legacy_ctrl, &chip);
-        if (err  < 0) {
-                release_and_free_resource(mpu_res);
-                release_and_free_resource(fm_res);
-                goto free_card;
-        }
-        chip->fm_res = fm_res;
-        chip->mpu_res = mpu_res;
-        card->private_data = chip;
+        err = snd_ymfpci_create(card, pci, old_legacy_ctrl);
+        if (err  < 0)
+                return err;
 
         strcpy(card->driver, str);
@@ -276 +270 @@
         err = snd_ymfpci_pcm(chip, 0);
         if (err < 0)
-                goto free_card;
+                return err;
 
         err = snd_ymfpci_pcm_spdif(chip, 1);
         if (err < 0)
-                goto free_card;
+                return err;
 
         err = snd_ymfpci_mixer(chip, rear_switch[dev]);
         if (err < 0)
-                goto free_card;
+                return err;
 
         if (chip->ac97->ext_id & AC97_EI_SDAC) {
                 err = snd_ymfpci_pcm_4ch(chip, 2);
                 if (err < 0)
-                        goto free_card;
+                        return err;
 
                 err = snd_ymfpci_pcm2(chip, 3);
                 if (err < 0)
-                        goto free_card;
+                        return err;
         }
         err = snd_ymfpci_timer(chip, 0);
         if (err < 0)
-                goto free_card;
-
-        if (chip->mpu_res) {
+                return err;
+
+        if (mpu_res) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
                                           mpu_port[dev],
@@ -313 +307 @@
                 }
         }
-        if (chip->fm_res) {
+        if (fm_res) {
                 err = snd_opl3_create(card,
                                       fm_port[dev],
@@ -328 +322 @@
                         if (err < 0) {
                                 dev_err(card->dev, "cannot create opl3 hwdep\n");
-                                goto free_card;
+                                return err;
                         }
                 }
@@ -337 +331 @@
         err = snd_card_register(card);
         if (err < 0)
-                goto free_card;
+                return err;
 
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
-
-free_card:
-        snd_card_free(card);
-        return err;
-}
-
-static void snd_card_ymfpci_remove(struct pci_dev *pci)
-{
-        snd_card_free(pci_get_drvdata(pci));
 }
 
@@ -357 +342 @@
         .id_table = snd_ymfpci_ids,
         .probe = snd_card_ymfpci_probe,
-        .remove = snd_card_ymfpci_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {