diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2014-02-18 05:11:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-18 15:33:33 -0500 |
commit | 04698ef3a00b2cb575fcc2c0e625563c6c90520d (patch) | |
tree | 19a5faf7dc8ae5dd28046f8fe54ce2ccd849a5d1 | |
parent | d9bd00a1ddac89a9d370cf9cdee018b9343114fc (diff) |
forcedeth: 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: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 74da48939e4e..bad3c057ee8a 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -3946,8 +3946,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
3946 | if (np->msi_flags & NV_MSI_X_CAPABLE) { | 3946 | if (np->msi_flags & NV_MSI_X_CAPABLE) { |
3947 | for (i = 0; i < (np->msi_flags & NV_MSI_X_VECTORS_MASK); i++) | 3947 | for (i = 0; i < (np->msi_flags & NV_MSI_X_VECTORS_MASK); i++) |
3948 | np->msi_x_entry[i].entry = i; | 3948 | np->msi_x_entry[i].entry = i; |
3949 | ret = pci_enable_msix(np->pci_dev, np->msi_x_entry, (np->msi_flags & NV_MSI_X_VECTORS_MASK)); | 3949 | ret = pci_enable_msix_range(np->pci_dev, |
3950 | if (ret == 0) { | 3950 | np->msi_x_entry, |
3951 | np->msi_flags & NV_MSI_X_VECTORS_MASK, | ||
3952 | np->msi_flags & NV_MSI_X_VECTORS_MASK); | ||
3953 | if (ret > 0) { | ||
3951 | np->msi_flags |= NV_MSI_X_ENABLED; | 3954 | np->msi_flags |= NV_MSI_X_ENABLED; |
3952 | if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) { | 3955 | if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) { |
3953 | /* Request irq for rx handling */ | 3956 | /* Request irq for rx handling */ |