diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igc/igc_main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 93f3b4e6185b..aa9323e55406 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c | |||
@@ -3912,13 +3912,11 @@ void igc_write_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value) | |||
3912 | s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value) | 3912 | s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value) |
3913 | { | 3913 | { |
3914 | struct igc_adapter *adapter = hw->back; | 3914 | struct igc_adapter *adapter = hw->back; |
3915 | u16 cap_offset; | ||
3916 | 3915 | ||
3917 | cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP); | 3916 | if (!pci_is_pcie(adapter->pdev)) |
3918 | if (!cap_offset) | ||
3919 | return -IGC_ERR_CONFIG; | 3917 | return -IGC_ERR_CONFIG; |
3920 | 3918 | ||
3921 | pci_read_config_word(adapter->pdev, cap_offset + reg, value); | 3919 | pcie_capability_read_word(adapter->pdev, reg, value); |
3922 | 3920 | ||
3923 | return IGC_SUCCESS; | 3921 | return IGC_SUCCESS; |
3924 | } | 3922 | } |
@@ -3926,13 +3924,11 @@ s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value) | |||
3926 | s32 igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value) | 3924 | s32 igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value) |
3927 | { | 3925 | { |
3928 | struct igc_adapter *adapter = hw->back; | 3926 | struct igc_adapter *adapter = hw->back; |
3929 | u16 cap_offset; | ||
3930 | 3927 | ||
3931 | cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP); | 3928 | if (!pci_is_pcie(adapter->pdev)) |
3932 | if (!cap_offset) | ||
3933 | return -IGC_ERR_CONFIG; | 3929 | return -IGC_ERR_CONFIG; |
3934 | 3930 | ||
3935 | pci_write_config_word(adapter->pdev, cap_offset + reg, *value); | 3931 | pcie_capability_write_word(adapter->pdev, reg, *value); |
3936 | 3932 | ||
3937 | return IGC_SUCCESS; | 3933 | return IGC_SUCCESS; |
3938 | } | 3934 | } |