summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2011-06-27 03:44:43 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-28 00:40:45 -0400
commite82760e7d6498d24d1a92f22767ba578c8980a6d (patch)
tree04e38c4c44c6df3cc5f54cdfd170cd466f7b27a8
parentbdaae04c65ef88645f50dabb43992033c754c4a7 (diff)
bnx2: remove unnecessary read of PCI_CAP_ID_EXP
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 74580bb175f1..7915d1404572 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)
7911 bp->chip_id = REG_RD(bp, BNX2_MISC_ID); 7911 bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
7912 7912
7913 if (CHIP_NUM(bp) == CHIP_NUM_5709) { 7913 if (CHIP_NUM(bp) == CHIP_NUM_5709) {
7914 if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) { 7914 if (!pci_is_pcie(pdev)) {
7915 dev_err(&pdev->dev, 7915 dev_err(&pdev->dev, "Not PCIE, aborting\n");
7916 "Cannot find PCIE capability, aborting\n");
7917 rc = -EIO; 7916 rc = -EIO;
7918 goto err_out_unmap; 7917 goto err_out_unmap;
7919 } 7918 }