Skip to content

Commit da4234c

Browse files
committed
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 <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250909061931.a1de688e574b.Ibd41b0c8f7fbae77026e76dbbc085df3eecec538@changeid
1 parent b7a9625 commit da4234c

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ static int iwl_init_otp_access(struct iwl_trans *trans)
766766
{
767767
int ret;
768768

769-
ret = iwl_finish_nic_init(trans);
769+
ret = iwl_trans_activate_nic(trans);
770770
if (ret)
771771
return ret;
772772

drivers/net/wireless/intel/iwlwifi/fw/dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static void iwl_fwrt_dump_lmac_error_log(struct iwl_fw_runtime *fwrt, u8 lmac_nu
178178
if (err)
179179
return;
180180

181-
err = iwl_finish_nic_init(trans);
181+
err = iwl_trans_activate_nic(trans);
182182
if (err)
183183
return;
184184
}

drivers/net/wireless/intel/iwlwifi/iwl-io.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,11 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)
396396
return 0;
397397
}
398398

399-
int iwl_finish_nic_init(struct iwl_trans *trans)
399+
int iwl_trans_activate_nic(struct iwl_trans *trans)
400400
{
401-
return iwl_pcie_gen1_2_finish_nic_init(trans);
401+
return iwl_pcie_gen1_2_activate_nic(trans);
402402
}
403-
IWL_EXPORT_SYMBOL(iwl_finish_nic_init);
403+
IWL_EXPORT_SYMBOL(iwl_trans_activate_nic);
404404

405405
void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr,
406406
u32 sw_err_bit)

drivers/net/wireless/intel/iwlwifi/iwl-io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
5757
void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);
5858
void iwl_force_nmi(struct iwl_trans *trans);
5959

60-
int iwl_finish_nic_init(struct iwl_trans *trans);
60+
int iwl_trans_activate_nic(struct iwl_trans *trans);
6161

6262
/* Error handling */
6363
int iwl_dump_fh(struct iwl_trans *trans, char **buf);

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ static int _iwl_pci_resume(struct device *device, bool restore)
12431243
* won't really know how to recover.
12441244
*/
12451245
iwl_pcie_prepare_card_hw(trans);
1246-
iwl_finish_nic_init(trans);
1246+
iwl_trans_activate_nic(trans);
12471247
iwl_op_mode_device_powered_off(trans->op_mode);
12481248
}
12491249

drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ int iwl_pcie_alloc_dma_ptr(struct iwl_trans *trans,
11311131
struct iwl_dma_ptr *ptr, size_t size);
11321132
void iwl_pcie_free_dma_ptr(struct iwl_trans *trans, struct iwl_dma_ptr *ptr);
11331133
void iwl_pcie_apply_destination(struct iwl_trans *trans);
1134-
int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans);
1134+
int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans);
11351135

11361136
/* transport gen 2 exported functions */
11371137
int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,

drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)
4747

4848
iwl_pcie_apm_config(trans);
4949

50-
ret = iwl_finish_nic_init(trans);
50+
ret = iwl_trans_activate_nic(trans);
5151
if (ret)
5252
return ret;
5353

drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)
267267
if (trans->mac_cfg->base->pll_cfg)
268268
iwl_set_bit(trans, CSR_ANA_PLL_CFG, CSR50_ANA_PLL_CFG_VAL);
269269

270-
ret = iwl_finish_nic_init(trans);
270+
ret = iwl_trans_activate_nic(trans);
271271
if (ret)
272272
return ret;
273273

@@ -340,7 +340,7 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)
340340
ret = iwl_trans_pcie_sw_reset(trans, true);
341341

342342
if (!ret)
343-
ret = iwl_finish_nic_init(trans);
343+
ret = iwl_trans_activate_nic(trans);
344344

345345
if (WARN_ON(ret)) {
346346
/* Release XTAL ON request */
@@ -1542,7 +1542,7 @@ int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
15421542
iwl_set_bit(trans, CSR_GP_CNTRL,
15431543
CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
15441544

1545-
ret = iwl_finish_nic_init(trans);
1545+
ret = iwl_trans_activate_nic(trans);
15461546
if (ret) {
15471547
IWL_ERR(trans, "Failed to init nic upon resume. err = %d\n",
15481548
ret);
@@ -1766,7 +1766,7 @@ static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)
17661766
{
17671767
int ret;
17681768

1769-
ret = iwl_finish_nic_init(trans);
1769+
ret = iwl_trans_activate_nic(trans);
17701770
if (ret < 0)
17711771
return ret;
17721772

@@ -4188,7 +4188,7 @@ int iwl_pci_gen1_2_probe(struct pci_dev *pdev,
41884188
*/
41894189
ret = iwl_pcie_prepare_card_hw(iwl_trans);
41904190
if (!ret) {
4191-
ret = iwl_finish_nic_init(iwl_trans);
4191+
ret = iwl_trans_activate_nic(iwl_trans);
41924192
if (ret)
41934193
goto out_free_trans;
41944194
if (iwl_trans_grab_nic_access(iwl_trans)) {
@@ -4308,7 +4308,7 @@ void iwl_pcie_gen1_2_remove(struct iwl_trans *trans)
43084308
iwl_trans_pcie_free(trans);
43094309
}
43104310

4311-
int iwl_pcie_gen1_2_finish_nic_init(struct iwl_trans *trans)
4311+
int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans)
43124312
{
43134313
const struct iwl_mac_cfg *mac_cfg = trans->mac_cfg;
43144314
u32 poll_ready;

0 commit comments

Comments
 (0)