Changeset 772 for GPL/trunk/alsa-kernel/pci/cs4281.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/cs4281.c (modified) (1 diff)

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

@@ -1309 +1309 @@
         chip->dual_codec = dual_codec;
 
-#ifndef TARGET_OS2
         err = pcim_iomap_regions(pci, 0x03, "CS4281"); /* 2 BARs */
         if (err < 0)
                 return err;
-#else
-        err = pci_request_regions(pci, "CS4281");
-        if (err < 0) {
-                kfree(chip);
-                pci_disable_device(pci);
-                return err;
-        }
-#endif
         chip->ba0_addr = pci_resource_start(pci, 0);
         chip->ba1_addr = pci_resource_start(pci, 1);
 
-#ifndef TARGET_OS2
         chip->ba0 = pcim_iomap_table(pci)[0];
         chip->ba1 = pcim_iomap_table(pci)[1];
-#else
-        chip->ba0 = pci_ioremap_bar(pci, 0);
-        chip->ba1 = pci_ioremap_bar(pci, 1);
-#endif
         if (devm_request_irq(&pci->dev, pci->irq, snd_cs4281_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, chip)) {