[dpdk-dev] [igb_uio PATCH 3/3] igb_uio: renaming pci config lock/unlock functions

[Yerden Zhumabekov]

renaming pci config lock/unlock functions using wrappers introduced
in commit f57049874f61046641a8eb1e9832810cc33befe5

Signed-off-by: Yerden Zhumabekov <e_zhumabekov at sts.kz>
---
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 
b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index 605410e..418bfa2 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -148,11 +148,11 @@ store_extended_tag(struct device *dev,
        else
                return -EINVAL;

-       pci_cfg_access_lock(pci_dev);
+       pci_config_lock(pci_dev);
        pci_bus_read_config_dword(pci_dev->bus, pci_dev->devfn,
                                        PCI_DEV_CAP_REG, &val);
        if (!(val & PCI_DEV_CAP_EXT_TAG_MASK)) { /* Not supported */
-               pci_cfg_access_unlock(pci_dev);
+               pci_config_unlock(pci_dev);
                return -EPERM;
        }

@@ -165,7 +165,7 @@ store_extended_tag(struct device *dev,
                val &= ~PCI_DEV_CTRL_EXT_TAG_MASK;
        pci_bus_write_config_dword(pci_dev->bus, pci_dev->devfn,
                                        PCI_DEV_CTRL_REG, val);
-       pci_cfg_access_unlock(pci_dev);
+       pci_config_unlock(pci_dev);

        return count;
 }
@@ -252,7 +252,7 @@ static bool pci_intx_mask_supported(struct pci_dev *pdev)
        bool mask_supported = false;
        uint16_t orig, new;

-       pci_block_user_cfg_access(pdev);
+       pci_config_lock(pdev);
        pci_read_config_word(pdev, PCI_COMMAND, &orig);
        pci_write_config_word(pdev, PCI_COMMAND,
                              orig ^ PCI_COMMAND_INTX_DISABLE);
@@ -265,7 +265,7 @@ static bool pci_intx_mask_supported(struct pci_dev *pdev)
                mask_supported = true;
                pci_write_config_word(pdev, PCI_COMMAND, orig);
        }
-       pci_unblock_user_cfg_access(pdev);
+       pci_config_unlock(pdev);

        return mask_supported;
 }
@@ -275,7 +275,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev)
        bool pending;
        uint32_t status;

-       pci_block_user_cfg_access(pdev);
+       pci_config_lock(pdev);
        pci_read_config_dword(pdev, PCI_COMMAND, &status);

        /* interrupt is not ours, goes to out */
@@ -292,7 +292,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev)
                if (old != new)
                        pci_write_config_word(pdev, PCI_COMMAND, new);
        }
-       pci_unblock_user_cfg_access(pdev);
+       pci_config_unlock(pdev);

        return pending;
 }
@@ -357,7 +357,7 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state)
        struct rte_uio_pci_dev *udev = igbuio_get_uio_pci_dev(info);
        struct pci_dev *pdev = udev->pdev;

-       pci_cfg_access_lock(pdev);
+       pci_config_lock(pdev);
        if (udev->mode == RTE_INTR_MODE_LEGACY)
                pci_intx(pdev, !!irq_state);
        else if (udev->mode == RTE_INTR_MODE_MSI) {
@@ -370,7 +370,7 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state)
                list_for_each_entry(desc, &pdev->msi_list, list)
                        igbuio_msix_mask_irq(desc, irq_state);
        }
-       pci_cfg_access_unlock(pdev);
+       pci_config_unlock(pdev);

        return 0;
 }
-- 
1.7.10.4