diff options
author | Jiang Liu <jiang.liu@huawei.com> | 2012-08-20 15:32:20 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 12:11:13 -0400 |
commit | 23d028cc86f6136e357980323dfe958eade547b4 (patch) | |
tree | 23fa2824565cab7ade725f78294b0d86e444dad9 /drivers | |
parent | f8c0fcacfe2e2fd4ee3eadd790959323097004fd (diff) |
igb: Use PCI Express Capability accessors
Use PCI Express Capability access functions to simplify igb driver.
[bhelgaas: split e1000e and igb into separate patches]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b7c2d5050572..9a379d9c07fa 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -6539,28 +6539,20 @@ static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
6539 | s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) | 6539 | s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) |
6540 | { | 6540 | { |
6541 | struct igb_adapter *adapter = hw->back; | 6541 | struct igb_adapter *adapter = hw->back; |
6542 | u16 cap_offset; | ||
6543 | 6542 | ||
6544 | cap_offset = adapter->pdev->pcie_cap; | 6543 | if (pcie_capability_read_word(adapter->pdev, reg, value)) |
6545 | if (!cap_offset) | ||
6546 | return -E1000_ERR_CONFIG; | 6544 | return -E1000_ERR_CONFIG; |
6547 | 6545 | ||
6548 | pci_read_config_word(adapter->pdev, cap_offset + reg, value); | ||
6549 | |||
6550 | return 0; | 6546 | return 0; |
6551 | } | 6547 | } |
6552 | 6548 | ||
6553 | s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) | 6549 | s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) |
6554 | { | 6550 | { |
6555 | struct igb_adapter *adapter = hw->back; | 6551 | struct igb_adapter *adapter = hw->back; |
6556 | u16 cap_offset; | ||
6557 | 6552 | ||
6558 | cap_offset = adapter->pdev->pcie_cap; | 6553 | if (pcie_capability_write_word(adapter->pdev, reg, *value)) |
6559 | if (!cap_offset) | ||
6560 | return -E1000_ERR_CONFIG; | 6554 | return -E1000_ERR_CONFIG; |
6561 | 6555 | ||
6562 | pci_write_config_word(adapter->pdev, cap_offset + reg, *value); | ||
6563 | |||
6564 | return 0; | 6556 | return 0; |
6565 | } | 6557 | } |
6566 | 6558 | ||