[PATCH v2 8/9] vdap: solidrun: Replace deprecated PCI functions

[Philipp Stanner]

solidrun utilizes pcim_iomap_regions(), which has been deprecated by the
PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()"), among other
things because it forces usage of quite a complicated bitmask mechanism.
The bitmask handling code can entirely be removed by replacing
pcim_iomap_regions() and pcim_iomap_table().

Replace pcim_iomap_regions() and pcim_iomap_table() with
pci_iomap_region().

Signed-off-by: Philipp Stanner <pstan...@redhat.com>
---
 drivers/vdpa/solidrun/snet_main.c | 53 +++++++++++--------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/drivers/vdpa/solidrun/snet_main.c 
b/drivers/vdpa/solidrun/snet_main.c
index 4d42a05d70fc..ce336f261649 100644
--- a/drivers/vdpa/solidrun/snet_main.c
+++ b/drivers/vdpa/solidrun/snet_main.c
@@ -556,36 +556,25 @@ static const struct vdpa_config_ops snet_config_ops = {
 static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet)
 {
        char *name;
-       int ret, i, mask = 0;
-       /* We don't know which BAR will be used to communicate..
-        * We will map every bar with len > 0.
-        *
-        * Later, we will discover the BAR and unmap all other BARs.
-        */
-       for (i = 0; i < PCI_STD_NUM_BARS; i++) {
-               if (pci_resource_len(pdev, i))
-                       mask |= (1 << i);
-       }
-
-       /* No BAR can be used.. */
-       if (!mask) {
-               SNET_ERR(pdev, "Failed to find a PCI BAR\n");
-               return -ENODEV;
-       }
+       unsigned short i;
 
        name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "psnet[%s]-bars", 
pci_name(pdev));
        if (!name)
                return -ENOMEM;
 
-       ret = pcim_iomap_regions(pdev, mask, name);
-       if (ret) {
-               SNET_ERR(pdev, "Failed to request and map PCI BARs\n");
-               return ret;
-       }
-
+       /* We don't know which BAR will be used to communicate..
+        * We will map every bar with len > 0.
+        *
+        * Later, we will discover the BAR and unmap all other BARs.
+        */
        for (i = 0; i < PCI_STD_NUM_BARS; i++) {
-               if (mask & (1 << i))
-                       psnet->bars[i] = pcim_iomap_table(pdev)[i];
+               if (!pci_resource_len(pdev, i))
+                       continue;
+               psnet->bars[i] = pcim_iomap_region(pdev, i, name);
+               if (IS_ERR(psnet->bars[i])) {
+                       SNET_ERR(pdev, "Failed to request and map PCI BARs\n");
+                       return PTR_ERR(psnet->bars[i]);
+               }
        }
 
        return 0;
@@ -594,18 +583,15 @@ static int psnet_open_pf_bar(struct pci_dev *pdev, struct 
psnet *psnet)
 static int snet_open_vf_bar(struct pci_dev *pdev, struct snet *snet)
 {
        char name[50];
-       int ret;
 
        snprintf(name, sizeof(name), "snet[%s]-bar", pci_name(pdev));
        /* Request and map BAR */
-       ret = pcim_iomap_regions(pdev, BIT(snet->psnet->cfg.vf_bar), name);
-       if (ret) {
+       snet->bar = pcim_iomap_region(pdev, snet->psnet->cfg.vf_bar, name);
+       if (IS_ERR(snet->bar)) {
                SNET_ERR(pdev, "Failed to request and map PCI BAR for a VF\n");
-               return ret;
+               return PTR_ERR(snet->bar);
        }
 
-       snet->bar = pcim_iomap_table(pdev)[snet->psnet->cfg.vf_bar];
-
        return 0;
 }
 
@@ -653,15 +639,12 @@ static int psnet_detect_bar(struct psnet *psnet, u32 off)
 
 static void psnet_unmap_unused_bars(struct pci_dev *pdev, struct psnet *psnet)
 {
-       int i, mask = 0;
+       int i;
 
        for (i = 0; i < PCI_STD_NUM_BARS; i++) {
                if (psnet->bars[i] && i != psnet->barno)
-                       mask |= (1 << i);
+                       pcim_iounmap_region(pdev, i);
        }
-
-       if (mask)
-               pcim_iounmap_regions(pdev, mask);
 }
 
 /* Read SNET config from PCI BAR */
-- 
2.46.0