lkml.org 
[lkml]   [2014]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] vmw_vmci: Use pci_enable_msix_range() instead of pci_enable_msix()
Date
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() and pci_enable_msix_range()
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
---
drivers/misc/vmw_vmci/vmci_guest.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index d35cda0..877ec8a 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -383,13 +383,18 @@ 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);
- if (result == 0)
+ result = pci_enable_msix_range(pdev, vmci_dev->msix_entries,
+ VMCI_MAX_INTRS, 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_range(pdev, vmci_dev->msix_entries,
+ 1, 1);
+ if (result < 0)
+ return result;
+ }

- return result;
+ return 0;
}

/*
--
1.7.7.6


\
 
 \ /
  Last update: 2014-02-19 11:41    [W:0.085 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site