Changeset 772 for GPL/trunk/alsa-kernel/pci/maestro3.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (5 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/maestro3.c (modified) (5 diffs)

GPL/trunk/alsa-kernel/pci/maestro3.c

@@ -2041 +2041 @@
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        struct snd_ctl_elem_id elem_id;
-#endif
         int err;
         static const struct snd_ac97_bus_ops ops = {
@@ -2066 +2063 @@
 
 #ifndef CONFIG_SND_MAESTRO3_INPUT
-        memset(&elem_id, 0, sizeof(elem_id));
-        elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(elem_id.name, "Master Playback Switch");
-        chip->master_switch = snd_ctl_find_id(chip->card, &elem_id);
-        memset(&elem_id, 0, sizeof(elem_id));
-        elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(elem_id.name, "Master Playback Volume");
-        chip->master_volume = snd_ctl_find_id(chip->card, &elem_id);
+        chip->master_switch = snd_ctl_find_id_mixer(chip->card,
+                                                    "Master Playback Switch");
+        chip->master_volume = snd_ctl_find_id_mixer(chip->card,
+                                                    "Master Playback Volume");
 #endif
 
@@ -2565 +2558 @@
 
         chip->num_substreams = NR_DSPS;
-#ifndef TARGET_OS2
         chip->substreams = devm_kcalloc(&pci->dev, chip->num_substreams,
                                         sizeof(struct m3_dma), GFP_KERNEL);
-#else
-        chip->substreams = kcalloc(chip->num_substreams, sizeof(struct m3_dma),
-                                   GFP_KERNEL);
-#endif
         if (!chip->substreams)
                 return -ENOMEM;
@@ -2603 +2591 @@
         snd_m3_hv_init(chip);
 
-#ifndef TARGET_OS2
         if (devm_request_irq(&pci->dev, pci->irq, snd_m3_interrupt, IRQF_SHARED,
                              KBUILD_MODNAME, chip)) {
@@ -2609 +2596 @@
                 return -ENOMEM;
         }
-#else
-        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                return -ENOMEM;
-        }
-#endif
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;