Pārlūkot izejas kodu

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>
Jon Mason 14 gadi atpakaļ
vecāks
revīzija
353064de8a
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 1 1
      drivers/net/e1000e/lib.c
  2. 1 1
      drivers/net/e1000e/netdev.c

+ 1 - 1
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;
 	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 {

+ 1 - 1
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) {
 	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);