From: Yijing Wang <wangyijing@huawei.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Gavin Shan <shangw@linux.vnet.ibm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
"David S. Miller" <davem@davemloft.net>
Cc: <linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
Yijing Wang <wangyijing@huawei.com>,
Hanjun Guo <guohanjun@huawei.com>,
<e1000-devel@lists.sourceforge.net>, <netdev@vger.kernel.org>
Subject: [PATCH 5/7] ixgbe: use pcie_capability_read_word() to simplify code
Date: Tue, 3 Sep 2013 15:35:13 +0800 [thread overview]
Message-ID: <1378193715-25328-5-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1378193715-25328-1-git-send-email-wangyijing@huawei.com>
use pcie_capability_read_word() to simplify code.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: e1000-devel@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bad8f14..bfa0b06 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -152,7 +152,6 @@ MODULE_VERSION(DRV_VERSION);
static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
u32 reg, u16 *value)
{
- int pos = 0;
struct pci_dev *parent_dev;
struct pci_bus *parent_bus;
@@ -164,11 +163,10 @@ static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
if (!parent_dev)
return -1;
- pos = pci_find_capability(parent_dev, PCI_CAP_ID_EXP);
- if (!pos)
+ if (!pci_is_pcie(parent_dev))
return -1;
- pci_read_config_word(parent_dev, pos + reg, value);
+ pcie_capability_read_word(parent_dev, reg, value);
return 0;
}
--
1.7.1
next prev parent reply other threads:[~2013-09-03 7:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-03 7:35 [PATCH 1/7] scsi/bfa: use pcie_capability_xxx to simplify code Yijing Wang
2013-09-03 7:35 ` [PATCH 2/7] scsi/csiostor: " Yijing Wang
2013-09-03 23:43 ` Bjorn Helgaas
2013-09-05 7:37 ` Yijing Wang
2013-09-03 7:35 ` [PATCH 3/7] powerpc/pci: use pci_is_pcie() " Yijing Wang
2013-09-04 21:07 ` Kumar Gala
2013-09-03 7:35 ` [PATCH 4/7] x86/pci: use pcie_cap " Yijing Wang
2013-09-04 2:59 ` Bjorn Helgaas
2013-09-05 6:34 ` Yijing Wang
2013-09-03 7:35 ` Yijing Wang [this message]
2013-09-04 9:26 ` [E1000-devel] [PATCH 5/7] ixgbe: use pcie_capability_read_word() " Jeff Kirsher
2013-09-04 16:20 ` Bjorn Helgaas
2013-09-04 17:24 ` Keller, Jacob E
2013-09-03 7:35 ` [PATCH 6/7] PCI: use pci_is_pcie() " Yijing Wang
2013-09-03 7:35 ` [PATCH 7/7] scsi/qla2xxx: use pcie_is_pcie() " Yijing Wang
2013-09-03 20:18 ` Chad Dupuis
2013-09-03 23:34 ` [PATCH 1/7] scsi/bfa: use pcie_capability_xxx " Bjorn Helgaas
2013-09-04 2:37 ` Bjorn Helgaas
2013-09-05 7:21 ` Yijing Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378193715-25328-5-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=JBottomley@parallels.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=e1000-devel@lists.sourceforge.net \
--cc=guohanjun@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shangw@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).