| Message ID | 1309196683-16046-1-git-send-email-jdmason@kudzu.us |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jon Mason <jdmason@kudzu.us> Date: Mon, 27 Jun 2011 12:44:43 -0500 > The PCIE capability offset is saved during PCI bus walking. It will > remove an unnecessary search in the PCI configuration space if this > value is referenced instead of reacquiring it. Also, pci_is_pcie is a > better way of determining if the device is PCIE or not (as it uses the > same saved PCIE capability offset). > > Signed-off-by: Jon Mason <jdmason@kudzu.us> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 74580bb..7915d14 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -7911,9 +7911,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) bp->chip_id = REG_RD(bp, BNX2_MISC_ID); if (CHIP_NUM(bp) == CHIP_NUM_5709) { - if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) { - dev_err(&pdev->dev, - "Cannot find PCIE capability, aborting\n"); + if (!pci_is_pcie(pdev)) { + dev_err(&pdev->dev, "Not PCIE, aborting\n"); rc = -EIO; goto err_out_unmap; }
The PCIE capability offset is saved during PCI bus walking. It will remove an unnecessary search in the PCI configuration space if this value is referenced instead of reacquiring it. Also, pci_is_pcie is a better way of determining if the device is PCIE or not (as it uses the same saved PCIE capability offset). Signed-off-by: Jon Mason <jdmason@kudzu.us> --- drivers/net/bnx2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)