diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2014-02-23 01:50:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 18:24:32 -0500 |
commit | e0117521e555224ec8938e69832b0b4c69954d54 (patch) | |
tree | def32c22ff614107ba1b27bcb43f3c2ed60ed545 | |
parent | ebba44ffcb848f38dfb9c95e5e20ebd2df3699a8 (diff) |
vmw_vmci: Use pci_enable_msix_exact() instead of pci_enable_msix()
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>
-rw-r--r-- | 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 d35cda06b5e8..e0d5017785e5 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, | |||
383 | vmci_dev->msix_entries[i].vector = i; | 383 | vmci_dev->msix_entries[i].vector = i; |
384 | } | 384 | } |
385 | 385 | ||
386 | result = pci_enable_msix(pdev, vmci_dev->msix_entries, VMCI_MAX_INTRS); | 386 | result = pci_enable_msix_exact(pdev, |
387 | vmci_dev->msix_entries, VMCI_MAX_INTRS); | ||
387 | if (result == 0) | 388 | if (result == 0) |
388 | vmci_dev->exclusive_vectors = true; | 389 | vmci_dev->exclusive_vectors = true; |
389 | else if (result > 0) | 390 | else if (result == -ENOSPC) |
390 | result = pci_enable_msix(pdev, vmci_dev->msix_entries, 1); | 391 | result = pci_enable_msix_exact(pdev, vmci_dev->msix_entries, 1); |
391 | 392 | ||
392 | return result; | 393 | return result; |
393 | } | 394 | } |