Commit 0cc7c959 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller

e1000e: 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: default avatarAlexander 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 7dc4c064
...@@ -2038,13 +2038,16 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter) ...@@ -2038,13 +2038,16 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
msix_entry), msix_entry),
GFP_KERNEL); GFP_KERNEL);
if (adapter->msix_entries) { if (adapter->msix_entries) {
struct e1000_adapter *a = adapter;
for (i = 0; i < adapter->num_vectors; i++) for (i = 0; i < adapter->num_vectors; i++)
adapter->msix_entries[i].entry = i; adapter->msix_entries[i].entry = i;
err = pci_enable_msix(adapter->pdev, err = pci_enable_msix_range(a->pdev,
adapter->msix_entries, a->msix_entries,
adapter->num_vectors); a->num_vectors,
if (err == 0) a->num_vectors);
if (err > 0)
return; return;
} }
/* MSI-X failed, so fall through and try MSI */ /* MSI-X failed, so fall through and try MSI */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment