wifi: iwlwifi: pcie: don't call itself indirectly

There's no reason for pcie code to call itself indirectly,
directly use the pcie functions instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: Yedidya Ben Shimol <yedidya.ben.shimol@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502155404.52db0b9fba15.I062e766ded86f61ec86104c28b84767f1c29ea78@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index abddaffcaaf09254220cb1f565d112732f839d24..bc19f082a8f5b6beb10bbf9dab33d087712d6d8e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -81,7 +81,7 @@ static void iwl_pcie_gen2_apm_stop(struct iwl_trans *trans, bool op_mode_leave)
        /* Stop device's DMA activity */
        iwl_pcie_apm_stop_master(trans);
 
-       iwl_trans_sw_reset(trans, false);
+       iwl_trans_pcie_sw_reset(trans, false);
 
        /*
         * Clear "initialization complete" bit to move adapter from
@@ -200,7 +200,7 @@ static void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)
        iwl_pcie_gen2_apm_stop(trans, false);
 
        /* re-take ownership to prevent other users from stealing the device */
-       iwl_trans_sw_reset(trans, true);
+       iwl_trans_pcie_sw_reset(trans, true);
 
        /*
         * Upon stop, the IVAR table gets erased, so msi-x won't

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index a6187922c06fd2b288315071b71d3e714178afca..b28aaf891bb5cb57cbd673d38450c8a24b941e68 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3551,8 +3551,8 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans,
                                       trans->dbg.dest_tlv->base_shift;
                        }
 
-                       iwl_trans_read_mem(trans, base, fw_mon_data->data,
-                                          monitor_len / sizeof(u32));
+                       iwl_trans_pcie_read_mem(trans, base, fw_mon_data->data,
+                                               monitor_len / sizeof(u32));
                } else if (trans->dbg.dest_tlv->monitor_mode == MARBH_MODE) {
                        monitor_len =
                                iwl_trans_pci_dump_marbh_monitor(trans,

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index bb90bcfc676399db27767d4ae63c3910ec997696..7c8cab294321a586f24502be594128ee1a4e3f43 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -497,9 +497,9 @@ void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)
                scd_base_addr != trans_pcie->scd_base_addr);
 
        /* reset context data, TX status and translation data */
-       iwl_trans_write_mem(trans, trans_pcie->scd_base_addr +
-                                  SCD_CONTEXT_MEM_LOWER_BOUND,
-                           NULL, clear_dwords);
+       iwl_trans_pcie_write_mem(trans, trans_pcie->scd_base_addr +
+                                       SCD_CONTEXT_MEM_LOWER_BOUND,
+                                NULL, clear_dwords);
 
        iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                       trans_pcie->txqs.scd_bc_tbls.dma >> 10);
@@ -1293,8 +1293,9 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,
        if (configure_scd) {
                iwl_scd_txq_set_inactive(trans, txq_id);
 
-               iwl_trans_write_mem(trans, stts_addr, (const void *)zero_val,
-                                   ARRAY_SIZE(zero_val));
+               iwl_trans_pcie_write_mem(trans, stts_addr,
+                                        (const void *)zero_val,
+                                        ARRAY_SIZE(zero_val));
        }
 
        iwl_pcie_txq_unmap(trans, txq_id);
@@ -2594,7 +2595,7 @@ static int iwl_trans_pcie_send_hcmd_sync(struct iwl_trans *trans,
                               cmd_str);
                ret = -ETIMEDOUT;
 
-               iwl_trans_sync_nmi(trans);
+               iwl_trans_pcie_sync_nmi(trans);
                goto cancel;
        }