| Message ID | 1309196969-16348-1-git-send-email-jdmason@kudzu.us (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 2011-06-27 at 10:49 -0700, Jon Mason wrote: > 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: Wey-Yi Guy <wey-yi.w.guy@intel.com> > --- > drivers/net/wireless/iwlwifi/iwl-pci.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 27, 2011 at 12:49:29PM -0500, Jon Mason wrote: > 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> > --- > drivers/net/wireless/iwlwifi/iwl-pci.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c > index 7328fbf..60d9140 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-pci.c > +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c > @@ -93,7 +93,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(priv->pci_dev); > pci_read_config_word(pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl); > return pci_lnk_ctl; > } > -- > 1.7.5.4 CC [M] drivers/net/wireless/iwlwifi/iwl-pci.o drivers/net/wireless/iwlwifi/iwl-pci.c: In function ‘iwl_pciexp_link_ctrl’: drivers/net/wireless/iwlwifi/iwl-pci.c:96:21: error: ‘priv’ undeclared (first use in this function) drivers/net/wireless/iwlwifi/iwl-pci.c:96:21: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [drivers/net/wireless/iwlwifi/iwl-pci.o] Error 1 make[1]: *** [drivers/net/wireless/iwlwifi] Error 2 make: *** [drivers/net/wireless/] Error 2 Please do make sure to compile patches before sending them to the list. JOhn
On Wed, Jun 29, 2011 at 2:02 PM, John W. Linville <linville@tuxdriver.com> wrote: > On Mon, Jun 27, 2011 at 12:49:29PM -0500, Jon Mason wrote: >> 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> >> --- >> drivers/net/wireless/iwlwifi/iwl-pci.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c >> index 7328fbf..60d9140 100644 >> --- a/drivers/net/wireless/iwlwifi/iwl-pci.c >> +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c >> @@ -93,7 +93,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(priv->pci_dev); >> pci_read_config_word(pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl); >> return pci_lnk_ctl; >> } >> -- >> 1.7.5.4 > > CC [M] drivers/net/wireless/iwlwifi/iwl-pci.o > drivers/net/wireless/iwlwifi/iwl-pci.c: In function ‘iwl_pciexp_link_ctrl’: > drivers/net/wireless/iwlwifi/iwl-pci.c:96:21: error: ‘priv’ undeclared (first use in this function) > drivers/net/wireless/iwlwifi/iwl-pci.c:96:21: note: each undeclared identifier is reported only once for each function it appears in > make[2]: *** [drivers/net/wireless/iwlwifi/iwl-pci.o] Error 1 > make[1]: *** [drivers/net/wireless/iwlwifi] Error 2 > make: *** [drivers/net/wireless/] Error 2 > > Please do make sure to compile patches before sending them to the list. My apologies. The underlying code changed between when I did the original version and when it was time to submit. Still, its no excuse for not at least compiling it. The fix is an easy one. - pos = pci_pcie_cap(priv->pci_dev); + pos = pci_pcie_cap(pci_dev); I'll resubmit the whole thing with the proper fix. Thanks, Jon > > JOhn > -- > John W. Linville Someday the world will need a hero, and you > linville@tuxdriver.com might be all we have. Be ready. > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 7328fbf..60d9140 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -93,7 +93,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(priv->pci_dev); pci_read_config_word(pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl); return pci_lnk_ctl; }
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> --- drivers/net/wireless/iwlwifi/iwl-pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)