]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: pcie: rename "continuous" memory
authorJohannes Berg <johannes.berg@intel.com>
Sat, 3 May 2025 19:44:20 +0000 (22:44 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Wed, 7 May 2025 03:08:00 +0000 (06:08 +0300)
What's really meant here is "contiguous", appreviate it
as "contig".

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250503224231.8c2ccc0a7469.I6ef88a48c2a2e5c0baa881382017d34eb07f9316@changeid
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c

index e383757cfbe09cc09f5960e198b5d8d7ba46c966..644ef3fb7ab71a2008c18406ff8162ae42615cc5 100644 (file)
@@ -347,9 +347,9 @@ void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans, bool alive)
        trans_pcie->prph_info = NULL;
 }
 
-static int iwl_pcie_load_payloads_continuously(struct iwl_trans *trans,
-                                              const struct iwl_pnvm_image *pnvm_data,
-                                              struct iwl_dram_data *dram)
+static int iwl_pcie_load_payloads_contig(struct iwl_trans *trans,
+                                        const struct iwl_pnvm_image *pnvm_data,
+                                        struct iwl_dram_data *dram)
 {
        u32 len, len0, len1;
 
@@ -470,10 +470,8 @@ int iwl_trans_pcie_ctx_info_gen3_load_pnvm(struct iwl_trans *trans,
                        trans->pnvm_loaded = true;
        } else {
                /* save only in one DRAM section */
-               ret = iwl_pcie_load_payloads_continuously
-                                               (trans,
-                                                pnvm_payloads,
-                                                &dram_regions->drams[0]);
+               ret = iwl_pcie_load_payloads_contig(trans, pnvm_payloads,
+                                                   &dram_regions->drams[0]);
                if (!ret) {
                        dram_regions->n_regions = 1;
                        trans->pnvm_loaded = true;
@@ -508,7 +506,7 @@ static void iwl_pcie_set_pnvm_segments(struct iwl_trans *trans)
                cpu_to_le32(iwl_dram_regions_size(dram_regions));
 }
 
-static void iwl_pcie_set_continuous_pnvm(struct iwl_trans *trans)
+static void iwl_pcie_set_contig_pnvm(struct iwl_trans *trans)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =
@@ -529,7 +527,7 @@ void iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,
        if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG))
                iwl_pcie_set_pnvm_segments(trans);
        else
-               iwl_pcie_set_continuous_pnvm(trans);
+               iwl_pcie_set_contig_pnvm(trans);
 }
 
 int iwl_trans_pcie_ctx_info_gen3_load_reduce_power(struct iwl_trans *trans,
@@ -566,10 +564,8 @@ int iwl_trans_pcie_ctx_info_gen3_load_reduce_power(struct iwl_trans *trans,
                        trans->reduce_power_loaded = true;
        } else {
                /* save only in one DRAM section */
-               ret = iwl_pcie_load_payloads_continuously
-                                               (trans,
-                                                payloads,
-                                                &dram_regions->drams[0]);
+               ret = iwl_pcie_load_payloads_contig(trans, payloads,
+                                                   &dram_regions->drams[0]);
                if (!ret) {
                        dram_regions->n_regions = 1;
                        trans->reduce_power_loaded = true;
@@ -592,7 +588,7 @@ static void iwl_pcie_set_reduce_power_segments(struct iwl_trans *trans)
                cpu_to_le32(iwl_dram_regions_size(dram_regions));
 }
 
-static void iwl_pcie_set_continuous_reduce_power(struct iwl_trans *trans)
+static void iwl_pcie_set_contig_reduce_power(struct iwl_trans *trans)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =
@@ -614,6 +610,6 @@ iwl_trans_pcie_ctx_info_gen3_set_reduce_power(struct iwl_trans *trans,
        if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG))
                iwl_pcie_set_reduce_power_segments(trans);
        else
-               iwl_pcie_set_continuous_reduce_power(trans);
+               iwl_pcie_set_contig_reduce_power(trans);
 }