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

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/cs423x/cs4231.c (modified) (3 diffs)
• alsa-kernel/isa/cs423x/cs4236.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/isa/cs423x/cs4231.c

@@ -24 +24 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4231}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -96 +95 @@
                 goto out;
 
-        strlcpy(card->driver, "CS4231", sizeof(card->driver));
-        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
+        strscpy(card->driver, "CS4231", sizeof(card->driver));
+        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
 
         if (dma2[n] < 0)
@@ -136 +135 @@
 }
 
-static int snd_cs4231_remove(struct device *dev, unsigned int n)
+static void snd_cs4231_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        return 0;
 }
 

GPL/trunk/alsa-kernel/isa/cs423x/cs4236.c

@@ -19 +19 @@
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cirrus Logic CS4232-9");
-MODULE_SUPPORTED_DEVICE("{{Turtle Beach,TBS-2000},"
-                "{Turtle Beach,Tropez Plus},"
-                "{SIC CrystalWave 32},"
-                "{Hewlett Packard,Omnibook 5500},"
-                "{TerraTec,Maestro 32/96},"
-                "{Philips,PCA70PS}},"
-                "{{Crystal Semiconductors,CS4235},"
-                "{Crystal Semiconductors,CS4236},"
-                "{Crystal Semiconductors,CS4237},"
-                "{Crystal Semiconductors,CS4238},"
-                "{Crystal Semiconductors,CS4239},"
-                "{Acer,AW37},"
-                "{Acer,AW35/Pro},"
-                "{Crystal,3D},"
-                "{Crystal Computer,TidalWave128},"
-                "{Dell,Optiplex GX1},"
-                "{Dell,Workstation 400 sound},"
-                "{EliteGroup,P5TX-LA sound},"
-                "{Gallant,SC-70P},"
-                "{Gateway,E1000 Onboard CS4236B},"
-                "{Genius,Sound Maker 3DJ},"
-                "{Hewlett Packard,HP6330 sound},"
-                "{IBM,PC 300PL sound},"
-                "{IBM,Aptiva 2137 E24},"
-                "{IBM,IntelliStation M Pro},"
-                "{Intel,Marlin Spike Mobo CS4235},"
-                "{Intel PR440FX Onboard},"
-                "{Guillemot,MaxiSound 16 PnP},"
-                "{NewClear,3D},"
-                "{TerraTec,AudioSystem EWS64L/XL},"
-                "{Typhoon Soundsystem,CS4236B},"
-                "{Turtle Beach,Malibu},"
-                "{Unknown,Digital PC 5000 Onboard}}");
-
 MODULE_ALIAS("snd_cs4232");
 
@@ -406 +372 @@
                         return err;
         }
-        strlcpy(card->driver, chip->pcm->name, sizeof(card->driver));
-        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
+        strscpy(card->driver, chip->pcm->name, sizeof(card->driver));
+        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
         if (dma2[dev] < 0)
                 snprintf(card->longname, sizeof(card->longname),
@@ -488 +454 @@
 }
 
-static int snd_cs423x_isa_remove(struct device *pdev,
+static void snd_cs423x_isa_remove(struct device *pdev,
                                  unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(pdev));
-        return 0;
 }