ixgbe: Use pci_enable_msix_range() 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() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index 32e3eaaa160a..0834e1ea44bc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -698,7 +698,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
 static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
                                        int vectors)
 {
-        int err, vector_threshold;
+        int vector_threshold;
 
         /* We'll want at least 2 (vector_threshold):
          * 1) TxQ[0] + RxQ[0] handler
@@ -712,18 +712,10 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
          * Right now, we simply care about how many we'll get; we'll
          * set them up later while requesting irq's.
          */
-        while (vectors >= vector_threshold) {
-                err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
-                                      vectors);
-                if (!err) /* Success in acquiring all requested vectors. */
-                        break;
-                else if (err < 0)
-                        vectors = 0; /* Nasty failure, quit now */
-                else /* err == number of vectors we should try again with */
-                        vectors = err;
-        }
+        vectors = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
+                                        vector_threshold, vectors);
 
-        if (vectors < vector_threshold) {
+        if (vectors < 0) {
                 /* Can't allocate enough MSI-X interrupts?  Oh well.
                  * This just means we'll go with either a single MSI
                  * vector or fall back to legacy interrupts.