From: Jon Mason Date: Mon, 27 Jun 2011 07:43:47 +0000 (+0000) Subject: e1000e: remove unnecessary reads of PCI_CAP_ID_EXP X-Git-Tag: v2.6.39-400.9.0~619^2~61 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8c1030238e564841601c9786ba0feb1b4b59fd5a;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: David S. Miller (cherry picked from commit 353064de8af3bf46757376db66c29fa87a9fda3a) Signed-off-by: Joe Jin --- diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 8d2860232214..5107efd536ad 100644 --- 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 f144d4689e46..cd225168a66f 100644 --- 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);