leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixgbe: use pcie_capability_read_word() to simplify code

Browse Source 
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>
This commit is contained in:
Yijing Wang 2013-09-04 17:30:08 +00:00 committed by Jeff Kirsher
parent f1f965793b
commit c0798edfb3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@ -153,7 +153,6 @@ MODULE_VERSION(DRV_VERSION);
static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter, static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
u32 reg, u16 *value) u32 reg, u16 *value)
{ {
int pos = 0;
struct pci_dev *parent_dev; struct pci_dev *parent_dev;
struct pci_bus *parent_bus; struct pci_bus *parent_bus;
@ -165,11 +164,10 @@ static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
if (!parent_dev) if (!parent_dev)
return -1; return -1;
pos = pci_find_capability(parent_dev, PCI_CAP_ID_EXP); if (!pci_is_pcie(parent_dev))
if (!pos)
return -1; return -1;
pci_read_config_word(parent_dev, pos + reg, value); pcie_capability_read_word(parent_dev, reg, value);
return 0; return 0;
} }