Changeset 695 for GPL/trunk/alsa-kernel/isa/opl3sa2.c

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/opl3sa2.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/isa/opl3sa2.c

@@ -23 +23 @@
 MODULE_DESCRIPTION("Yamaha OPL3SA2+");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF719E-S},"
-                "{Genius,Sound Maker 3DX},"
-                "{Yamaha,OPL3SA3},"
-                "{Intel,AL440LX sound},"
-                "{NeoMagic,MagicWave 3DX}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -883 +878 @@
 }
 
-static int snd_opl3sa2_isa_remove(struct device *devptr,
+static void snd_opl3sa2_isa_remove(struct device *devptr,
                                   unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        return 0;
 }