summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-09-04 17:30:08 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-10-24 06:55:54 -0700
commitc0798edfb32497a886308a2614fd0a4e6da499c0 (patch)
tree1ea3e4637b6d84926e7149522d473388e791a5cb /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parentf1f965793b2bb8a75067e94acbe886a61637cab8 (diff)
downloadblackbird-op-linux-c0798edfb32497a886308a2614fd0a4e6da499c0.tar.gz
blackbird-op-linux-c0798edfb32497a886308a2614fd0a4e6da499c0.zip
ixgbe: use pcie_capability_read_word() to simplify code
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>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c6
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 6828d0e7dc42..ce3eb603333e 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;
}
OpenPOWER on IntegriCloud