Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b29562 authored by Yijing Wang's avatar Yijing Wang Committed by David S. Miller
Browse files

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: default avatarYijing Wang <wangyijing@huawei.com>
Cc: Andrew Gallatin <gallatin@myri.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae2104be

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

+2 −3
Original line number Diff line number Diff line
@@ -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;