]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ALSA: korg1212: Replace deprecated PCI functions
authorPhilipp Stanner <pstanner@redhat.com>
Wed, 30 Oct 2024 11:27:42 +0000 (12:27 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 30 Oct 2024 21:07:38 +0000 (16:07 -0500)
pcim_iomap_table() and pcim_iomap_regions_request_all() have been
deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").

Replace these functions with their successors, pcim_iomap() and
pcim_request_all_regions().

Link: https://lore.kernel.org/r/20241030112743.104395-10-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
sound/pci/korg1212/korg1212.c

index e62fb1ad6d77c5762d790d900837fb7ac5b59b9f..49b71082c48597e93cb2062ac699deb71d639143 100644 (file)
@@ -2108,7 +2108,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci)
         for (i=0; i<kAudioChannels; i++)
                 korg1212->volumePhase[i] = 0;
 
-       err = pcim_iomap_regions_request_all(pci, 1 << 0, "korg1212");
+       err = pcim_request_all_regions(pci, "korg1212");
        if (err < 0)
                return err;
 
@@ -2130,7 +2130,9 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci)
                   korg1212->iomem2, iomem2_size,
                   stateName[korg1212->cardState]);
 
-       korg1212->iobase = pcim_iomap_table(pci)[0];
+       korg1212->iobase = pcim_iomap(pci, 0, 0);
+       if (!korg1212->iobase)
+               return -ENOMEM;
 
        err = devm_request_irq(&pci->dev, pci->irq, snd_korg1212_interrupt,
                           IRQF_SHARED,