Skip to content

Commit

Permalink
ixgbe: use pcie_capability_read_word() to simplify code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yijing Wang authored and Jeff Kirsher committed Oct 24, 2013
1 parent f1f9657 commit c0798ed
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down

0 comments on commit c0798ed

Please sign in to comment.