ALSA: atiixp: Replace deprecated PCI functions
authorPhilipp Stanner <phasta@kernel.org>
Fri, 4 Apr 2025 12:19:03 +0000 (14:19 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 7 Apr 2025 07:19:57 +0000 (09:19 +0200)
pcim_iomap_table() and pcim_iomap_regions() have been deprecated.
Replace them with pcim_iomap_region().

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250404121911.85277-4-phasta@kernel.org
sound/pci/atiixp.c
sound/pci/atiixp_modem.c

index df2fef726d603bbcfa15b9328bf1532fe01bba83..427006be240bd99079e02152b844d66ee4aa9bfc 100644 (file)
@@ -1544,11 +1544,10 @@ static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)
        chip->card = card;
        chip->pci = pci;
        chip->irq = -1;
-       err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP AC97");
-       if (err < 0)
-               return err;
+       chip->remap_addr = pcim_iomap_region(pci, 0, "ATI IXP AC97");
+       if (IS_ERR(chip->remap_addr))
+               return PTR_ERR(chip->remap_addr);
        chip->addr = pci_resource_start(pci, 0);
-       chip->remap_addr = pcim_iomap_table(pci)[0];
 
        if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
                             IRQF_SHARED, KBUILD_MODNAME, chip)) {
index eb569539f322543c5a15c53d0ea7dd7211cee600..8d3083b9b024d46f6e827ed72feeb2d08161aad1 100644 (file)
@@ -1174,11 +1174,10 @@ static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)
        chip->card = card;
        chip->pci = pci;
        chip->irq = -1;
-       err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP MC97");
-       if (err < 0)
-               return err;
+       chip->remap_addr = pcim_iomap_region(pci, 0, "ATI IXP MC97");
+       if (IS_ERR(chip->remap_addr))
+               return PTR_ERR(chip->remap_addr);
        chip->addr = pci_resource_start(pci, 0);
-       chip->remap_addr = pcim_iomap_table(pci)[0];
 
        if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
                             IRQF_SHARED, KBUILD_MODNAME, chip)) {