aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-09-04 13:30:08 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-10-24 09:55:54 -0400
commitc0798edfb32497a886308a2614fd0a4e6da499c0 (patch)
tree1ea3e4637b6d84926e7149522d473388e791a5cb /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parentf1f965793b2bb8a75067e94acbe886a61637cab8 (diff)
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);
153static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter, 153static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
154 u32 reg, u16 *value) 154 u32 reg, u16 *value)
155{ 155{
156 int pos = 0;
157 struct pci_dev *parent_dev; 156 struct pci_dev *parent_dev;
158 struct pci_bus *parent_bus; 157 struct pci_bus *parent_bus;
159 158
@@ -165,11 +164,10 @@ static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
165 if (!parent_dev) 164 if (!parent_dev)
166 return -1; 165 return -1;
167 166
168 pos = pci_find_capability(parent_dev, PCI_CAP_ID_EXP); 167 if (!pci_is_pcie(parent_dev))
169 if (!pos)
170 return -1; 168 return -1;
171 169
172 pci_read_config_word(parent_dev, pos + reg, value); 170 pcie_capability_read_word(parent_dev, reg, value);
173 return 0; 171 return 0;
174} 172}
175 173