From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Yijing Wang <wangyijing@huawei.com>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/11] ixgbe: use pcie_capability_read_word() to simplify code
Date: Thu, 24 Oct 2013 08:27:34 -0700	[thread overview]
Message-ID: <1382628458-26601-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1382628458-26601-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Yijing Wang <wangyijing@huawei.com>
use pcie_capability_read_word() to simplify code.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++----
 1 file 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 6828d0e7..ce3eb60 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -153,7 +153,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;
 
@@ -165,11 +164,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.8.3.1
next prev parent reply	other threads:[~2013-10-24 15:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-24 15:27 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-24 15:27 ` [net-next 01/11] igbvf: integer wrapping bug setting the mtu Jeff Kirsher
2013-10-24 15:27 ` [net-next 02/11] igbvf: add missing iounmap() on error in igbvf_probe() Jeff Kirsher
2013-10-24 15:27 ` [net-next 03/11] i40e: remove unused including <linux/version.h> Jeff Kirsher
2013-10-24 15:27 ` [net-next 04/11] igb: Fix master/slave mode for all m88 i354 PHY's Jeff Kirsher
2013-10-24 15:27 ` [net-next 05/11] igb: fix driver reload with VF assigned to guest Jeff Kirsher
2013-10-24 15:27 ` [net-next 06/11] ixgbe: cleanup ixgbe_enumerate_functions Jeff Kirsher
2013-10-24 15:27 ` Jeff Kirsher [this message]
2013-10-24 15:27 ` [net-next 08/11] ixgbe: fix rx-usecs range checks for BQL Jeff Kirsher
2013-10-24 15:27 ` [net-next 09/11] ixgbevf: Adds function to set PSRTYPE register Jeff Kirsher
2013-10-24 15:27 ` [net-next 10/11] ixgbevf: implement ethtool get/set coalesce Jeff Kirsher
2013-10-24 15:27 ` [net-next 11/11] ixgbevf: bump driver version Jeff Kirsher
2013-10-26  4:30 ` [net-next 00/11][pull request] Intel Wired LAN Driver Updates David Miller
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=1382628458-26601-8-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    --cc=wangyijing@huawei.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).