diff options
| author |   Alexander Gordeev <agordeev@redhat.com> | 2014-02-18 11:11:50 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-02-18 15:33:32 -0500 |
| commit | 37a15ed3b9c89f2796dc4e6c7650ad4a2d73e117 (patch) | |
| tree | 5bf31369fc99843a7cf99a77d479c8a0d95c6390 /drivers/net/ethernet/neterion/s2io.c | |
| parent | myri10ge: Use pci_enable_msix_range() instead of pci_enable_msix() (diff) | |
| download | linux-dev-37a15ed3b9c89f2796dc4e6c7650ad4a2d73e117.tar.xz linux-dev-37a15ed3b9c89f2796dc4e6c7650ad4a2d73e117.zip | |
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: Alexander Gordeev <agordeev@redhat.com>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.c')
| -rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 9eeddbd0b2c7..56e3a9d42bb2 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -3792,9 +3792,10 @@ static int s2io_enable_msi_x(struct s2io_nic *nic) writeq(rx_mat, &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 */ - if (ret) { + if (ret < 0) { DBG_PRINT(ERR_DBG, "Enabling MSI-X failed\n"); kfree(nic->entries); swstats->mem_freed += nic->num_entries * |