Changeset 695 for GPL/trunk/alsa-kernel/isa/gus

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/gus/gusclassic.c (modified) (2 diffs)
• alsa-kernel/isa/gus/gusextreme.c (modified) (2 diffs)
• alsa-kernel/isa/gus/gusmax.c (modified) (2 diffs)
• alsa-kernel/isa/gus/interwave.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/isa/gus/gusclassic.c

@@ -24 +24 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Classic}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -196 +195 @@
 }
 
-static int snd_gusclassic_remove(struct device *dev, unsigned int n)
+static void snd_gusclassic_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        return 0;
 }
 

GPL/trunk/alsa-kernel/isa/gus/gusextreme.c

@@ -28 +28 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Extreme}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -325 +324 @@
 }
 
-static int snd_gusextreme_remove(struct device *dev, unsigned int n)
+static void snd_gusextreme_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        return 0;
 }
 

GPL/trunk/alsa-kernel/isa/gus/gusmax.c

@@ -22 +22 @@
 MODULE_DESCRIPTION("Gravis UltraSound MAX");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound MAX}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -339 +338 @@
 }
 
-static int snd_gusmax_remove(struct device *devptr, unsigned int dev)
+static void snd_gusmax_remove(struct device *devptr, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        return 0;
 }
 

GPL/trunk/alsa-kernel/isa/gus/interwave.c

@@ -29 +29 @@
 #ifndef SNDRV_STB
 MODULE_DESCRIPTION("AMD InterWave");
-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Plug & Play},"
-                "{STB,SoundRage32},"
-                "{MED,MED3210},"
-                "{Dynasonix,Dynasonix Pro},"
-                "{Panasonic,PCA761AW}}");
 #else
 MODULE_DESCRIPTION("AMD InterWave STB with TEA6330T");
-MODULE_SUPPORTED_DEVICE("{{AMD,InterWave STB with TEA6330T}}");
 #endif
 
@@ -826 +820 @@
 }
 
-static int snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
+static void snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        return 0;
 }