diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2013-08-08 21:02:44 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-09 13:49:51 -0700 |
| commit | 40b295625053954f69d6840d59f2b4d8be251ed3 (patch) | |
| tree | 2b9f5d0712f219998d9b23c8f5e4650608ac7f02 /drivers/net/ethernet/myricom | |
| parent | ae2104be25a5698bb24d436855f6af9b65ea26fe (diff) | |
| download | linux-40b295625053954f69d6840d59f2b4d8be251ed3.tar.bz2 | |
myri10ge: clean up unnecessary MSI/MSI-X capability find
PCI core will initialize device MSI/MSI-X capability in
pci_msi_init_pci_dev(). So device driver should use
pci_dev->msi_cap/msix_cap to determine whether the device
support MSI/MSI-X instead of using
pci_find_capability(pci_dev, PCI_CAP_ID_MSI/MSIX).
Access to PCIe device config space again will consume more time.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: Andrew Gallatin <gallatin@myri.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/myricom')
| -rw-r--r-- | drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index d4cdf4dc4bc4..66c040047da7 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -3625,13 +3625,12 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) struct pci_dev *pdev = mgp->pdev; char *old_fw; bool old_allocated; - int i, status, ncpus, msix_cap; + int i, status, ncpus; mgp->num_slices = 1; - msix_cap = pci_find_capability(pdev, PCI_CAP_ID_MSIX); ncpus = netif_get_num_default_rss_queues(); - if (myri10ge_max_slices == 1 || msix_cap == 0 || + if (myri10ge_max_slices == 1 || !pdev->msix_cap || (myri10ge_max_slices == -1 && ncpus < 2)) return; |