Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1971c4f9 authored by Haim Dreyfuss's avatar Haim Dreyfuss Committed by Luca Coelho
Browse files

iwlwifi: remove unused regdb_ptrs allocation 



regdb_ptrs is not in used anymore, remove it.

Signed-off-by: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 41874d3a

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+0 −14
Original line number Diff line number Diff line
@@ -1066,11 +1066,6 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan, 
	return flags;

}



struct regdb_ptrs {

	struct ieee80211_wmm_rule *rule;

	u32 token;

};



struct ieee80211_regdomain *

iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,

		       int num_of_ch, __le32 *channels, u16 fw_mcc,
@@ -1082,7 +1077,6 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
	const u16 *nvm_chan;

	struct ieee80211_regdomain *regd, *copy_rd;

	struct ieee80211_reg_rule *rule;

	struct regdb_ptrs *regdb_ptrs;

	enum nl80211_band band;

	int center_freq, prev_center_freq = 0;

	int valid_rules = 0;
@@ -1114,12 +1108,6 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
	if (!regd)

		return ERR_PTR(-ENOMEM);



	regdb_ptrs = kcalloc(num_of_ch, sizeof(*regdb_ptrs), GFP_KERNEL);

	if (!regdb_ptrs) {

		copy_rd = ERR_PTR(-ENOMEM);

		goto out;

	}



	/* set alpha2 from FW. */

	regd->alpha2[0] = fw_mcc >> 8;

	regd->alpha2[1] = fw_mcc & 0xff;
@@ -1191,8 +1179,6 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
	if (!copy_rd)

		copy_rd = ERR_PTR(-ENOMEM);



out:

	kfree(regdb_ptrs);

	kfree(regd);

	return copy_rd;

}