serial: rp2: Replace deprecated PCI functions

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-9-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>

diff --git a/drivers/tty/serial/rp2.c b/drivers/tty/serial/rp2.c
index 8bab2aedc4991ff7352d0a547065b8b4ad59bd0a..6d99a02dd439d0e35bba8bc6302198caea78ff92 100644 (file)
--- a/drivers/tty/serial/rp2.c
+++ b/drivers/tty/serial/rp2.c
@@ -698,7 +698,6 @@ static int rp2_probe(struct pci_dev *pdev,
        const struct firmware *fw;
        struct rp2_card *card;
        struct rp2_uart_port *ports;
-       void __iomem * const *bars;
        int rc;
 
        card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
@@ -711,13 +710,16 @@ static int rp2_probe(struct pci_dev *pdev,
        if (rc)
                return rc;
 
-       rc = pcim_iomap_regions_request_all(pdev, 0x03, DRV_NAME);
+       rc = pcim_request_all_regions(pdev, DRV_NAME);
        if (rc)
                return rc;
 
-       bars = pcim_iomap_table(pdev);
-       card->bar0 = bars[0];
-       card->bar1 = bars[1];
+       card->bar0 = pcim_iomap(pdev, 0, 0);
+       if (!card->bar0)
+               return -ENOMEM;
+       card->bar1 = pcim_iomap(pdev, 1, 0);
+       if (!card->bar1)
+               return -ENOMEM;
        card->pdev = pdev;
 
        rp2_decode_cap(id, &card->n_ports, &card->smpte);