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>

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index dd8ab05b559086c56c677be53dd19159afed1f5a..bd72b8167df9d77e08d80709335f4376b6964f3f 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 3bf52499743c9a639e21607cfd2d4607afcae632..ed7a93d356f44ba39d55089ca8bbe20f88ee144f 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5318,7 +5318,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);