firewire: ohci: Replace deprecated PCI functions
authorPhilipp Stanner <pstanner@redhat.com>
Mon, 28 Oct 2024 09:44:42 +0000 (10:44 +0100)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 28 Oct 2024 10:47:09 +0000 (19:47 +0900)
pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()").

Replace these functions with pcim_iomap_region().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Link: https://lore.kernel.org/r/20241028094440.19115-3-pstanner@redhat.com
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/ohci.c

index 4dbd203..c02aed1 100644 (file)
@@ -3726,12 +3726,11 @@ static int pci_probe(struct pci_dev *dev,
                return -ENXIO;
        }
 
-       err = pcim_iomap_regions(dev, 1 << 0, ohci_driver_name);
-       if (err) {
+       ohci->registers = pcim_iomap_region(dev, 0, ohci_driver_name);
+       if (IS_ERR(ohci->registers)) {
                ohci_err(ohci, "request and map MMIO resource unavailable\n");
                return -ENXIO;
        }
-       ohci->registers = pcim_iomap_table(dev)[0];
 
        for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)
                if ((ohci_quirks[i].vendor == dev->vendor) &&