ethernet: cavium: Replace deprecated PCI functions

pcim_iomap_regions() and pcim_iomap_table() have been deprecated by
the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").

Replace the deprecated PCI functions with their successors.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Philipp Stanner <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Paolo Abeni <[email protected]>

diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c
index 9fd717b9cf69ec0bcc6b681d4bc2c5d0f76c23c9..984f0dd7b62e19e35cf789fe870b102e5ad8ca9d 100644 (file)
--- a/drivers/net/ethernet/cavium/common/cavium_ptp.c
+++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c
@@ -239,12 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev,
        if (err)
                goto error_free;
 
-       err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO, pci_name(pdev));
+       clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev));
+       err = PTR_ERR_OR_ZERO(clock->reg_base);
        if (err)
                goto error_free;
 
-       clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO];
-
        spin_lock_init(&clock->spin_lock);
 
        cc = &clock->cycle_counter;
@@ -292,7 +291,7 @@ error_stop:
        clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG);
        clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN;
        writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG);
-       pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO);
+       pcim_iounmap_region(pdev, PCI_PTP_BAR_NO);
 
 error_free:
        devm_kfree(dev, clock);