e1000e: remove unnecessary reads 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.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 353064de8af3bf46757376db66c29fa87a9fda3a)

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 8d2860232214a2d7f3437e61c680d427aeaf2178..5107efd536ad44b6c606c91e34ff73360bdfc3e6 100644 (file)
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -56,7 +56,7 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
        struct e1000_adapter *adapter = hw->adapter;
        u16 pcie_link_status, cap_offset;
 
-       cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+       cap_offset = adapter->pdev->pcie_cap;
        if (!cap_offset) {
                bus->width = e1000_bus_width_unknown;
        } else {

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index f144d4689e466fbc86e80cebdaf9b2fcacdb85b0..cd225168a66fdc32dde8e4cb27752e6c29f2d33c 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5317,7 +5317,7 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
         */
        if (adapter->flags & FLAG_IS_QUAD_PORT) {
                struct pci_dev *us_dev = pdev->bus->self;
-               int pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
+               int pos = pci_pcie_cap(us_dev);
                u16 devctl;
 
                pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);