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

Commit 555a8428 authored by Yijing Wang's avatar Yijing Wang Committed by David S. Miller
Browse files

bnx2: 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: Michael Chan <mchan@broadcom.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77273eaa

drivers/net/ethernet/broadcom/bnx2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -8139,13 +8139,13 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 




	if (BNX2_CHIP(bp) == BNX2_CHIP_5709 &&

	if (BNX2_CHIP(bp) == BNX2_CHIP_5709 &&

	    BNX2_CHIP_REV(bp) != BNX2_CHIP_REV_Ax) {

	    BNX2_CHIP_REV(bp) != BNX2_CHIP_REV_Ax) {

		if (pci_find_capability(pdev, PCI_CAP_ID_MSIX))

		if (pdev->msix_cap)

			bp->flags |= BNX2_FLAG_MSIX_CAP;

			bp->flags |= BNX2_FLAG_MSIX_CAP;

	}

	}





	if (BNX2_CHIP_ID(bp) != BNX2_CHIP_ID_5706_A0 &&

	if (BNX2_CHIP_ID(bp) != BNX2_CHIP_ID_5706_A0 &&

	    BNX2_CHIP_ID(bp) != BNX2_CHIP_ID_5706_A1) {

	    BNX2_CHIP_ID(bp) != BNX2_CHIP_ID_5706_A1) {

		if (pci_find_capability(pdev, PCI_CAP_ID_MSI))

		if (pdev->msi_cap)

			bp->flags |= BNX2_FLAG_MSI_CAP;

			bp->flags |= BNX2_FLAG_MSI_CAP;

	}

	}