As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range()  or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Andy King <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: [email protected]
---
 drivers/misc/vmw_vmci/vmci_guest.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c 
b/drivers/misc/vmw_vmci/vmci_guest.c
index d35cda0..e0d5017 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -383,11 +383,12 @@ static int vmci_enable_msix(struct pci_dev *pdev,
                vmci_dev->msix_entries[i].vector = i;
        }
 
-       result = pci_enable_msix(pdev, vmci_dev->msix_entries, VMCI_MAX_INTRS);
+       result = pci_enable_msix_exact(pdev,
+                                      vmci_dev->msix_entries, VMCI_MAX_INTRS);
        if (result == 0)
                vmci_dev->exclusive_vectors = true;
-       else if (result > 0)
-               result = pci_enable_msix(pdev, vmci_dev->msix_entries, 1);
+       else if (result == -ENOSPC)
+               result = pci_enable_msix_exact(pdev, vmci_dev->msix_entries, 1);
 
        return result;
 }
-- 
1.7.7.6

-- 
Regards,
Alexander Gordeev
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to