iwlwifi: remove unnecessary read of PCI_CAP_ID_EXP

jonmason · linvjw · commit 68dd49ef907f · 2011-07-06T15:05:41.000-04:00
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 &lt;jdmason@kudzu.us&gt;
Acked-by: Wey-Yi Guy &lt;wey-yi.w.guy@intel.com&gt;
Signed-off-by: John W. Linville &lt;linville@tuxdriver.com&gt;
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -94,7 +94,7 @@ static u16 iwl_pciexp_link_ctrl(struct iwl_bus *bus)
 	u16 pci_lnk_ctl;
 	struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
 
-	pos = pci_find_capability(pci_dev, PCI_CAP_ID_EXP);
+	pos = pci_pcie_cap(pci_dev);
 	pci_read_config_word(pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl);
 	return pci_lnk_ctl;
 }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static u16 iwl_pciexp_link_ctrl(struct iwl_bus *bus)`
`94`	`94`	`u16 pci_lnk_ctl;`
`95`	`95`	`struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);`
`96`	`96`
`97`		`- pos = pci_find_capability(pci_dev, PCI_CAP_ID_EXP);`
	`97`	`+ pos = pci_pcie_cap(pci_dev);`
`98`	`98`	`pci_read_config_word(pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl);`
`99`	`99`	`return pci_lnk_ctl;`
`100`	`100`	`}`