thunderbolt: Replace deprecated PCI functions

pcim_iomap_table() and pcim_request_regions() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()") and commit d140f80f60358 ("PCI:
Deprecate pcim_iomap_regions() in favor of pcim_iomap_region()").

Replace these functions with pcim_iomap_region().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 7af2642b97cb8133f1e4d49854cb41f323c2c8ed..1257dd3ce7e6a3b759576af8c9c5401cbefdadb4 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1340,18 +1340,18 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (res)
                return dev_err_probe(dev, res, "cannot enable PCI device, aborting\n");
 
-       res = pcim_iomap_regions(pdev, 1 << 0, "thunderbolt");
-       if (res)
-               return dev_err_probe(dev, res, "cannot obtain PCI resources, aborting\n");
-
        nhi = devm_kzalloc(&pdev->dev, sizeof(*nhi), GFP_KERNEL);
        if (!nhi)
                return -ENOMEM;
 
        nhi->pdev = pdev;
        nhi->ops = (const struct tb_nhi_ops *)id->driver_data;
-       /* cannot fail - table is allocated in pcim_iomap_regions */
-       nhi->iobase = pcim_iomap_table(pdev)[0];
+
+       nhi->iobase = pcim_iomap_region(pdev, 0, "thunderbolt");
+       res = PTR_ERR_OR_ZERO(nhi->iobase);
+       if (res)
+               return dev_err_probe(dev, res, "cannot obtain PCI resources, aborting\n");
+
        nhi->hop_count = ioread32(nhi->iobase + REG_CAPS) & 0x3ff;
        dev_dbg(dev, "total paths: %d\n", nhi->hop_count);