From patchwork Mon Jun 27 17:49:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 921812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5RHneov015817 for ; Mon, 27 Jun 2011 17:49:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752883Ab1F0Rtg (ORCPT ); Mon, 27 Jun 2011 13:49:36 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:34954 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925Ab1F0Rte (ORCPT ); Mon, 27 Jun 2011 13:49:34 -0400 Received: by pvg12 with SMTP id 12so2994668pvg.19 for ; Mon, 27 Jun 2011 10:49:34 -0700 (PDT) Received: by 10.68.13.230 with SMTP id k6mr1853489pbc.341.1309196973911; Mon, 27 Jun 2011 10:49:33 -0700 (PDT) Received: from scylla (cpe-70-113-48-102.austin.res.rr.com [70.113.48.102]) by mx.google.com with ESMTPS id q5sm995734pbk.42.2011.06.27.10.49.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 10:49:33 -0700 (PDT) Received: by scylla (sSMTP sendmail emulation); Mon, 27 Jun 2011 12:49:29 -0500 From: Jon Mason To: Wey-Yi Guy Cc: Intel Linux Wireless , linux-wireless@vger.kernel.org Subject: [PATCH 18/19] iwlwifi: remove unnecessary read of PCI_CAP_ID_EXP Date: Mon, 27 Jun 2011 12:49:29 -0500 Message-Id: <1309196969-16348-1-git-send-email-jdmason@kudzu.us> X-Mailer: git-send-email 1.7.5.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Jun 2011 17:49:40 +0000 (UTC) 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: Wey-Yi Guy --- 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; }