Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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)
 s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value)
 {
         struct igc_adapter *adapter = hw->back;
-        u16 cap_offset;
 
-        cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-        if (!cap_offset)
+        if (!pci_is_pcie(adapter->pdev))
                 return -IGC_ERR_CONFIG;
 
-        pci_read_config_word(adapter->pdev, cap_offset + reg, value);
+        pcie_capability_read_word(adapter->pdev, reg, value);
 
         return IGC_SUCCESS;
 }
@@ -3926,13 +3924,11 @@ s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value)
 s32 igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value)
 {
         struct igc_adapter *adapter = hw->back;
-        u16 cap_offset;
 
-        cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-        if (!cap_offset)
+        if (!pci_is_pcie(adapter->pdev))
                 return -IGC_ERR_CONFIG;
 
-        pci_write_config_word(adapter->pdev, cap_offset + reg, *value);
+        pcie_capability_write_word(adapter->pdev, reg, *value);
 
         return IGC_SUCCESS;
 }