Changeset 717 for GPL/trunk/alsa-kernel/drivers/mpu401/mpu401.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/drivers/mpu401/mpu401.c (modified) (6 diffs)

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401.c

@@ -72 +72 @@
 
         *rcard = NULL;
-        err = snd_card_new(devptr, index[dev], id[dev], THIS_MODULE,
-                           0, &card);
+        err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,
+                                0, &card);
         if (err < 0)
                 return err;
@@ -89 +89 @@
         if (err < 0) {
                 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
-                goto _err;
+                return err;
         }
 
         *rcard = card;
         return 0;
-
- _err:
-        snd_card_free(card);
-        return err;
 }
 
@@ -118 +114 @@
                 return err;
         err = snd_card_register(card);
-        if (err < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if (err < 0)
+                return err;
         platform_set_drvdata(devptr, card);
-        return 0;
-}
-
-static int snd_mpu401_remove(struct platform_device *devptr)
-{
-        snd_card_free(platform_get_drvdata(devptr));
         return 0;
 }
@@ -136 +124 @@
 static struct platform_driver snd_mpu401_driver = {
         .probe          = snd_mpu401_probe,
-        .remove         = snd_mpu401_remove,
         .driver         = {
                 .name   = SND_MPU401_DRIVER,
@@ -197 +184 @@
                         return err;
                 err = snd_card_register(card);
-                if (err < 0) {
-                        snd_card_free(card);
+                if (err < 0)
                         return err;
-                }
                 pnp_set_drvdata(pnp_dev, card);
                 snd_mpu401_devices++;
@@ -209 +194 @@
 }
 
-static void snd_mpu401_pnp_remove(struct pnp_dev *dev)
-{
-        struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
-
-        snd_card_disconnect(card);
-        snd_card_free_when_closed(card);
-}
-
 static struct pnp_driver snd_mpu401_pnp_driver = {
         .name = "mpu401",
         .id_table = snd_mpu401_pnpids,
         .probe = snd_mpu401_pnp_probe,
-        .remove = snd_mpu401_pnp_remove,
 };
 #else