Changeset 695 for GPL/trunk/alsa-kernel/isa/cs423x/cs4231.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/cs423x/cs4231.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;
 }