wifi: iwlwifi: rename iwl_finish_nic_init

The function is called so because for older devices it sets a bit called
"init_done". But for the latest devices it sets a different bit,
"mac_init". Since this name is not clear anyway, rename it such that it
indicates the logic of the newer devices.
Also add the 'trans' prefix so iw will be clear from the name that this
is a transport API.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250909061931.a1de688e574b.Ibd41b0c8f7fbae77026e76dbbc085df3eecec538@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
index 9f8cdb027839a6d55bc5d0b2c2d3e7b6ee5b521a..d337ab543eb00695701431572d53db79f1cb6a30 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
@@ -766,7 +766,7 @@ static int iwl_init_otp_access(struct iwl_trans *trans)
 {
        int ret;
 
-       ret = iwl_finish_nic_init(trans);
+       ret = iwl_trans_activate_nic(trans);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dump.c b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
index a39c038db08ee5cf580ea19c67e23e0ed0f621ce..ddd714cff2f4d8dcba925100078a1c5436e5cd8d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dump.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
@@ -178,7 +178,7 @@ static void iwl_fwrt_dump_lmac_error_log(struct iwl_fw_runtime *fwrt, u8 lmac_nu
                if (err)
                        return;
 
-               err = iwl_finish_nic_init(trans);
+               err = iwl_trans_activate_nic(trans);
                if (err)
                        return;
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index fb645dafea3834c6c8659bd6a8cafbb12ead0fdd..b1944584c69315fa9533240345fd4f1708a673ff 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -396,11 +396,11 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)
        return 0;
 }
 
-int iwl_finish_nic_init(struct iwl_trans *trans)
+int iwl_trans_activate_nic(struct iwl_trans *trans)
 {
-       return iwl_pcie_gen1_2_finish_nic_init(trans);
+       return iwl_pcie_gen1_2_activate_nic(trans);
 }
-IWL_EXPORT_SYMBOL(iwl_finish_nic_init);
+IWL_EXPORT_SYMBOL(iwl_trans_activate_nic);
 
 void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr,
                                  u32 sw_err_bit)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
index 731cda1a4e6632ea8b089c1b3070229d64b23f90..5bcec239ffc4ac93363075b6d38a98218289c5ba 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h
@@ -57,7 +57,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);
 void iwl_force_nmi(struct iwl_trans *trans);
 
-int iwl_finish_nic_init(struct iwl_trans *trans);
+int iwl_trans_activate_nic(struct iwl_trans *trans);
 
 /* Error handling */
 int iwl_dump_fh(struct iwl_trans *trans, char **buf);

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 5cb0b519e762aa6e647dc0e12fa3132b5eb6ad67..e68dce21df64749dc382bd1fad76910ba25cb419 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1243,7 +1243,7 @@ static int _iwl_pci_resume(struct device *device, bool restore)
                 * won't really know how to recover.
                 */
                iwl_pcie_prepare_card_hw(trans);
-               iwl_finish_nic_init(trans);
+               iwl_trans_activate_nic(trans);
                iwl_op_mode_device_powered_off(trans->op_mode);
        }
 

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
index 79893e2d2701663f2748ffeadaf09d6f52569d52..36fe5863f7353c3fe9be7a561f17ba42f015596d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
@@ -1131,7 +1131,7 @@ int iwl_pcie_alloc_dma_ptr(struct iwl_trans *trans,
                           struct iwl_dma_ptr *ptr, size_t size);
 void iwl_pcie_free_dma_ptr(struct iwl_trans *trans, struct iwl_dma_ptr *ptr);
 void iwl_pcie_apply_destination(struct iwl_trans *trans);
-int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans);
+int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans);
 
 /* transport gen 2 exported functions */
 int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
index 1951be3a30b7861659156313edc033782e2b9da1..b15c5d48652776de369d0e8347b31455baf3c2e5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
@@ -47,7 +47,7 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)
 
        iwl_pcie_apm_config(trans);
 
-       ret = iwl_finish_nic_init(trans);
+       ret = iwl_trans_activate_nic(trans);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
index f281d91475b4becb3214f1b3b6d8592d7be18c41..922397408138c3d30b2b23455222c1e3747628dc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -267,7 +267,7 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)
        if (trans->mac_cfg->base->pll_cfg)
                iwl_set_bit(trans, CSR_ANA_PLL_CFG, CSR50_ANA_PLL_CFG_VAL);
 
-       ret = iwl_finish_nic_init(trans);
+       ret = iwl_trans_activate_nic(trans);
        if (ret)
                return ret;
 
@@ -340,7 +340,7 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)
        ret = iwl_trans_pcie_sw_reset(trans, true);
 
        if (!ret)
-               ret = iwl_finish_nic_init(trans);
+               ret = iwl_trans_activate_nic(trans);
 
        if (WARN_ON(ret)) {
                /* Release XTAL ON request */
@@ -1542,7 +1542,7 @@ int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
                iwl_set_bit(trans, CSR_GP_CNTRL,
                            CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
 
-       ret = iwl_finish_nic_init(trans);
+       ret = iwl_trans_activate_nic(trans);
        if (ret) {
                IWL_ERR(trans, "Failed to init nic upon resume. err = %d\n",
                        ret);
@@ -1766,7 +1766,7 @@ static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)
 {
        int ret;
 
-       ret = iwl_finish_nic_init(trans);
+       ret = iwl_trans_activate_nic(trans);
        if (ret < 0)
                return ret;
 
@@ -4188,7 +4188,7 @@ int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
         */
        ret = iwl_pcie_prepare_card_hw(iwl_trans);
        if (!ret) {
-               ret = iwl_finish_nic_init(iwl_trans);
+               ret = iwl_trans_activate_nic(iwl_trans);
                if (ret)
                        goto out_free_trans;
                if (iwl_trans_grab_nic_access(iwl_trans)) {
@@ -4308,7 +4308,7 @@ void iwl_pcie_gen1_2_remove(struct iwl_trans *trans)
        iwl_trans_pcie_free(trans);
 }
 
-int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans)
+int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans)
 {
        const struct iwl_mac_cfg *mac_cfg = trans->mac_cfg;
        u32 poll_ready;