Changeset 772 for GPL/trunk/alsa-kernel/pci/cs46xx

Timestamp:

Apr 19, 2025, 8:08:37 PM (6 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/cs46xx/cs46xx_lib.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx_lib.c

@@ -536 +536 @@
 }
 
-int snd_cs46xx_download_image(struct snd_cs46xx *chip)
+static __maybe_unused int snd_cs46xx_download_image(struct snd_cs46xx *chip)
 {
         int idx, err;
@@ -2454 +2454 @@
 {
         struct snd_card *card = chip->card;
-        struct snd_ctl_elem_id id;
         int err;
         unsigned int idx;
@@ -2495 +2494 @@
 
         /* get EAPD mixer switch (for voyetra hack) */
-        memset(&id, 0, sizeof(id));
-        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(id.name, "External Amplifier");
-        chip->eapd_switch = snd_ctl_find_id(chip->card, &id);
+        chip->eapd_switch = snd_ctl_find_id_mixer(chip->card,
+                                                  "External Amplifier");
     
 #ifdef CONFIG_SND_CS46XX_NEW_DSP