Commit 353064de authored by Jon Mason's avatar Jon Mason Committed by David S. Miller

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: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6532e9cb
...@@ -56,7 +56,7 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) ...@@ -56,7 +56,7 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
struct e1000_adapter *adapter = hw->adapter; struct e1000_adapter *adapter = hw->adapter;
u16 pcie_link_status, cap_offset; 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) { if (!cap_offset) {
bus->width = e1000_bus_width_unknown; bus->width = e1000_bus_width_unknown;
} else { } else {
......
...@@ -5318,7 +5318,7 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, ...@@ -5318,7 +5318,7 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
*/ */
if (adapter->flags & FLAG_IS_QUAD_PORT) { if (adapter->flags & FLAG_IS_QUAD_PORT) {
struct pci_dev *us_dev = pdev->bus->self; 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; u16 devctl;
pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl); pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment