1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 7abc5c81af2c..09d2e3ffd6fc 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -70,7 +70,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)
                 pci_write_config_word(pdev, PCI_COMMAND, cmd);
         }
 
-        msix_pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);
+        msix_pos = pdev->msix_cap;
         if (msix_pos) {
                 u16 flags;
                 u32 table;
@@ -78,8 +78,8 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)
                 pci_read_config_word(pdev, msix_pos + PCI_MSIX_FLAGS, &flags);
                 pci_read_config_dword(pdev, msix_pos + PCI_MSIX_TABLE, &table);
 
-                vdev->msix_bar = table & PCI_MSIX_FLAGS_BIRMASK;
-                vdev->msix_offset = table & ~PCI_MSIX_FLAGS_BIRMASK;
+                vdev->msix_bar = table & PCI_MSIX_TABLE_BIR;
+                vdev->msix_offset = table & PCI_MSIX_TABLE_OFFSET;
                 vdev->msix_size = ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) * 16;
         } else
                 vdev->msix_bar = 0xFF;
@@ -183,7 +183,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type)
                 u8 pos;
                 u16 flags;
 
-                pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSI);
+                pos = vdev->pdev->msi_cap;
                 if (pos) {
                         pci_read_config_word(vdev->pdev,
                                              pos + PCI_MSI_FLAGS, &flags);
@@ -194,7 +194,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type)
                 u8 pos;
                 u16 flags;
 
-                pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSIX);
+                pos = vdev->pdev->msix_cap;
                 if (pos) {
                         pci_read_config_word(vdev->pdev,
                                              pos + PCI_MSIX_FLAGS, &flags);