Changeset 772 for GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ymfpci/ymfpci.c (modified) (8 diffs)

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

@@ -103 +103 @@
                 case 0x205: legacy_ctrl2 |= 3 << 6; break;
                 default:
-                        dev_err(chip->card->dev,
-                                "invalid joystick port %#x", io_port);
+                        if (io_port > 0)
+                                dev_err(chip->card->dev,
+                                        "The %s does not support arbitrary IO ports for the game port (requested 0x%x)\n",
+                                        chip->card->shortname, (unsigned int)io_port);
                         return -EINVAL;
                 }
@@ -155 +157 @@
 #endif /* SUPPORT_JOYSTICK */
 
-static int snd_card_ymfpci_probe(struct pci_dev *pci,
-                                 const struct pci_device_id *pci_id)
+static int __snd_card_ymfpci_probe(struct pci_dev *pci,
+                                   const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -175 +177 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
                            sizeof(*chip), &card);
         if (err < 0)
@@ -191 +193 @@
         }
 
+        strcpy(card->driver, str);
+        sprintf(card->shortname, "Yamaha %s (%s)", model, str);
+        sprintf(card->longname, "%s at 0x%lx, irq %i",
+                card->shortname,
+                chip->reg_area_phys,
+                chip->irq);
+
         legacy_ctrl = 0;
         legacy_ctrl2 = 0x0800;  /* SBEN = 0, SMOD = 01, LAD = 0 */
@@ -223 +232 @@
                 case 0x3a0: legacy_ctrl2 |= 2; break;
                 case 0x3a8: legacy_ctrl2 |= 3; break;
-                default: fm_port[dev] = 0; break;
+                default:
+                        if (fm_port[dev] > 0)
+                                dev_err(card->dev,
+                                        "The %s does not support arbitrary IO ports for FM (requested 0x%x)\n",
+                                        card->shortname, (unsigned int)fm_port[dev]);
+                        fm_port[dev] = 0;
+                        break;
                 }
                 if (fm_port[dev] > 0)
@@ -239 +254 @@
                 case 0x332: legacy_ctrl2 |= 2 << 4; break;
                 case 0x334: legacy_ctrl2 |= 3 << 4; break;
-                default: mpu_port[dev] = 0; break;
+                default:
+                        if (mpu_port[dev] > 0)
+                                dev_err(card->dev,
+                                        "The %s does not support arbitrary IO ports for MPU-401 (requested 0x%x)\n",
+                                        card->shortname, (unsigned int)mpu_port[dev]);
+                        mpu_port[dev] = 0;
+                        break;
                 }
                 if (mpu_port[dev] > 0)
@@ -262 +283 @@
                 return err;
 
-        strcpy(card->driver, str);
-        sprintf(card->shortname, "Yamaha %s (%s)", model, str);
-        sprintf(card->longname, "%s at 0x%lx, irq %i",
-                card->shortname,
-                chip->reg_area_phys,
-                chip->irq);
         err = snd_ymfpci_pcm(chip, 0);
         if (err < 0)
@@ -338 +353 @@
 }
 
+static int snd_card_ymfpci_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_card_ymfpci_probe(pci, pci_id));
+}
+
 static struct pci_driver ymfpci_driver = {
         .name = KBUILD_MODNAME,
         .id_table = snd_ymfpci_ids,
         .probe = snd_card_ymfpci_probe,
-#ifdef CONFIG_PM_SLEEP
         .driver = {
-                .pm = &snd_ymfpci_pm,
+                .pm = pm_sleep_ptr(&snd_ymfpci_pm),
         },
-#endif
 };