Commit 37a15ed3 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller

s2io: 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: Jon Mason <jdmason@kudzu.us>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0729cc0c
...@@ -3792,9 +3792,10 @@ static int s2io_enable_msi_x(struct s2io_nic *nic) ...@@ -3792,9 +3792,10 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
writeq(rx_mat, &bar0->rx_mat); writeq(rx_mat, &bar0->rx_mat);
readq(&bar0->rx_mat); readq(&bar0->rx_mat);
ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries); ret = pci_enable_msix_range(nic->pdev, nic->entries,
nic->num_entries, nic->num_entries);
/* We fail init if error or we get less vectors than min required */ /* We fail init if error or we get less vectors than min required */
if (ret) { if (ret < 0) {
DBG_PRINT(ERR_DBG, "Enabling MSI-X failed\n"); DBG_PRINT(ERR_DBG, "Enabling MSI-X failed\n");
kfree(nic->entries); kfree(nic->entries);
swstats->mem_freed += nic->num_entries * swstats->mem_freed += nic->num_entries *
......
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