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>
(cherry picked from commit e82760e7d6498d24d1a92f22767ba578c8980a6d)

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 74580bb175f1ec6e0b48e52365582c2521a3c064..7915d1404572dd50603b433d3b36947412635fda 100644 (file)
--- 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;
                }