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

Timestamp:

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

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

@@ -564 +564 @@
                 dev_dbg(&pci->dev, "atiixp quirk for %s.  Forcing codec %d\n",
                         snd_pci_quirk_name(q), q->value);
-
                 return q->value;
         }
@@ -1563 +1562 @@
         chip->pci = pci;
         chip->irq = -1;
-#ifndef TARGET_OS2
         err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP AC97");
         if (err < 0)
                 return err;
-#else
-        err = pci_request_regions(pci, "ATI IXP AC97");
-        if (err < 0) {
-                pci_disable_device(pci);
-                kfree(chip);
-                return err;
-        }
-#endif
         chip->addr = pci_resource_start(pci, 0);
-#ifndef TARGET_OS2
         chip->remap_addr = pcim_iomap_table(pci)[0];
-#else
-        chip->remap_addr = pci_ioremap_bar(pci, 0);
-#endif
         if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, chip)) {