vmw_vmci: Use pci_enable_msix_exact() instead of pci_enable_msix()
authorAlexander Gordeev <agordeev@redhat.com>
Sun, 23 Feb 2014 06:50:41 +0000 (07:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Feb 2014 23:24:32 +0000 (15:24 -0800)
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 <agordeev@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy King <acking@vmware.com>
Cc: Dmitry Torokhov <dtor@vmware.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/vmw_vmci/vmci_guest.c

index d35cda0..e0d5017 100644 (file)
@@ -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;
 }